OpenSSL upgraded to 1.1.1

1 files changed, 12 insertions, 69 deletions

diff --git a/include/openssl/aes.h b/include/openssl/aes.h
index 9b9c7319cc..d96ea5de88 100644
--- a/include/openssl/aes.h
+++ b/include/openssl/aes.h
@@ -1,52 +1,10 @@
-/* crypto/aes/aes.h */

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

- * Copyright (c) 1998-2002 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.

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

+/*

+ * Copyright 2002-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

  */

 

 #ifndef HEADER_AES_H

@@ -54,11 +12,10 @@
 

 # include <openssl/opensslconf.h>

 

-# ifdef OPENSSL_NO_AES

-#  error AES is disabled.

-# endif

-

 # include <stddef.h>

+# ifdef  __cplusplus

+extern "C" {

+# endif

 

 # define AES_ENCRYPT     1

 # define AES_DECRYPT     0

@@ -70,10 +27,6 @@
 # define AES_MAXNR 14

 # define AES_BLOCK_SIZE 16

 

-#ifdef  __cplusplus

-extern "C" {

-#endif

-

 /* This should be a hidden type, but EVP requires that the size be known */

 struct aes_key_st {

 # ifdef AES_LONG

@@ -92,11 +45,6 @@ int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
 int AES_set_decrypt_key(const unsigned char *userKey, const int bits,

                         AES_KEY *key);

 

-int private_AES_set_encrypt_key(const unsigned char *userKey, const int bits,

-                                AES_KEY *key);

-int private_AES_set_decrypt_key(const unsigned char *userKey, const int bits,

-                                AES_KEY *key);

-

 void AES_encrypt(const unsigned char *in, unsigned char *out,

                  const AES_KEY *key);

 void AES_decrypt(const unsigned char *in, unsigned char *out,

@@ -119,11 +67,6 @@ void AES_cfb8_encrypt(const unsigned char *in, unsigned char *out,
 void AES_ofb128_encrypt(const unsigned char *in, unsigned char *out,

                         size_t length, const AES_KEY *key,

                         unsigned char *ivec, int *num);

-void AES_ctr128_encrypt(const unsigned char *in, unsigned char *out,

-                        size_t length, const AES_KEY *key,

-                        unsigned char ivec[AES_BLOCK_SIZE],

-                        unsigned char ecount_buf[AES_BLOCK_SIZE],

-                        unsigned int *num);

 /* NB: the IV is _two_ blocks long */

 void AES_ige_encrypt(const unsigned char *in, unsigned char *out,

                      size_t length, const AES_KEY *key,

@@ -142,8 +85,8 @@ int AES_unwrap_key(AES_KEY *key, const unsigned char *iv,
                    const unsigned char *in, unsigned int inlen);

 

 

-#ifdef  __cplusplus

+# ifdef  __cplusplus

 }

-#endif

+# endif

 

-#endif                          /* !HEADER_AES_H */

+#endif