OpenSSL upgraded to 1.1.1

1 files changed, 19 insertions, 72 deletions

diff --git a/include/openssl/seed.h b/include/openssl/seed.h
index 11fd1819cd..d6947f01e2 100644
--- a/include/openssl/seed.h
+++ b/include/openssl/seed.h
@@ -1,4 +1,13 @@
 /*

+ * Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.

+ *

+ * Licensed under the OpenSSL license (the "License").  You may not use

+ * this file except in compliance with the License.  You can obtain a copy

+ * in the file LICENSE in the source distribution or at

+ * https://www.openssl.org/source/license.html

+ */

+

+/*

  * Copyright (c) 2007 KISA(Korea Information Security Agency). All rights reserved.

  *

  * Redistribution and use in source and binary forms, with or without

@@ -21,72 +30,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

  * SUCH DAMAGE.

- *

- */

-/* ====================================================================

- * Copyright (c) 1998-2007 The OpenSSL Project.  All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- *

- * 1. Redistributions of source code must retain the above copyright

- *    notice, this list of conditions and the following disclaimer.

- *

- * 2. Redistributions in binary form must reproduce the above copyright

- *    notice, this list of conditions and the following disclaimer in

- *    the documentation and/or other materials provided with the

- *    distribution.

- *

- * 3. All advertising materials mentioning features or use of this

- *    software must display the following acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

- *

- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

- *    endorse or promote products derived from this software without

- *    prior written permission. For written permission, please contact

- *    openssl-core@openssl.org.

- *

- * 5. Products derived from this software may not be called "OpenSSL"

- *    nor may "OpenSSL" appear in their names without prior written

- *    permission of the OpenSSL Project.

- *

- * 6. Redistributions of any form whatsoever must retain the following

- *    acknowledgment:

- *    "This product includes software developed by the OpenSSL Project

- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

- *

- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

- * OF THE POSSIBILITY OF SUCH DAMAGE.

- * ====================================================================

- *

- * This product includes cryptographic software written by Eric Young

- * (eay@cryptsoft.com).  This product includes software written by Tim

- * Hudson (tjh@cryptsoft.com).

- *

  */

 

 #ifndef HEADER_SEED_H

 # define HEADER_SEED_H

 

 # include <openssl/opensslconf.h>

+

+# ifndef OPENSSL_NO_SEED

 # include <openssl/e_os2.h>

 # include <openssl/crypto.h>

 

-# ifdef OPENSSL_NO_SEED

-#  error SEED is disabled.

-# endif

+#ifdef  __cplusplus

+extern "C" {

+#endif

 

 /* look whether we need 'long' to get 32 bits */

 # ifdef AES_LONG

@@ -95,18 +52,11 @@
 #  endif

 # endif

 

-# if !defined(NO_SYS_TYPES_H)

-#  include <sys/types.h>

-# endif

+# include <sys/types.h>

 

 # define SEED_BLOCK_SIZE 16

 # define SEED_KEY_LENGTH 16

 

-

-#ifdef  __cplusplus

-extern "C" {

-#endif

-

 typedef struct seed_key_st {

 # ifdef SEED_LONG

     unsigned long data[32];

@@ -115,10 +65,6 @@ typedef struct seed_key_st {
 # endif

 } SEED_KEY_SCHEDULE;

 

-# ifdef OPENSSL_FIPS

-void private_SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],

-                          SEED_KEY_SCHEDULE *ks);

-# endif

 void SEED_set_key(const unsigned char rawkey[SEED_KEY_LENGTH],

                   SEED_KEY_SCHEDULE *ks);

 

@@ -142,8 +88,9 @@ void SEED_ofb128_encrypt(const unsigned char *in, unsigned char *out,
                          size_t len, const SEED_KEY_SCHEDULE *ks,

                          unsigned char ivec[SEED_BLOCK_SIZE], int *num);

 

-#ifdef  __cplusplus

+# ifdef  __cplusplus

 }

-#endif

+# endif

+# endif

 

-#endif                          /* HEADER_SEED_H */

+#endif