OpenSSL upgraded to 1.1.1

1 files changed, 115 insertions, 187 deletions

diff --git a/include/openssl/dh.h b/include/openssl/dh.h
index ae900cfe08..948d03c359 100644
--- a/include/openssl/dh.h
+++ b/include/openssl/dh.h
@@ -1,98 +1,50 @@
-/* crypto/dh/dh.h */

-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)

- * All rights reserved.

- *

- * This package is an SSL implementation written

- * by Eric Young (eay@cryptsoft.com).

- * The implementation was written so as to conform with Netscapes SSL.

- *

- * This library is free for commercial and non-commercial use as long as

- * the following conditions are aheared to.  The following conditions

- * apply to all code found in this distribution, be it the RC4, RSA,

- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation

- * included with this distribution is covered by the same copyright terms

- * except that the holder is Tim Hudson (tjh@cryptsoft.com).

- *

- * Copyright remains Eric Young's, and as such any Copyright notices in

- * the code are not to be removed.

- * If this package is used in a product, Eric Young should be given attribution

- * as the author of the parts of the library used.

- * This can be in the form of a textual message at program startup or

- * in documentation (online or textual) provided with the package.

- *

- * 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 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 acknowledgement:

- *    "This product includes cryptographic software written by

- *     Eric Young (eay@cryptsoft.com)"

- *    The word 'cryptographic' can be left out if the rouines from the library

- *    being used are not cryptographic related :-).

- * 4. If you include any Windows specific code (or a derivative thereof) from

- *    the apps directory (application code) you must include an acknowledgement:

- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"

- *

- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND

- * ANY EXPRESS 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 AUTHOR OR 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 1995-2018 The OpenSSL Project Authors. All Rights Reserved.

  *

- * The licence and distribution terms for any publically available version or

- * derivative of this code cannot be changed.  i.e. this code cannot simply be

- * copied and put under another distribution licence

- * [including the GNU Public Licence.]

+ * 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_DH_H

 # define HEADER_DH_H

 

-# include <openssl/e_os2.h>

-

-# ifdef OPENSSL_NO_DH

-#  error DH is disabled.

-# endif

+# include <openssl/opensslconf.h>

 

-# ifndef OPENSSL_NO_BIO

-#  include <openssl/bio.h>

-# endif

+# ifndef OPENSSL_NO_DH

+# include <openssl/e_os2.h>

+# include <openssl/bio.h>

+# include <openssl/asn1.h>

 # include <openssl/ossl_typ.h>

-# ifndef OPENSSL_NO_DEPRECATED

+# if OPENSSL_API_COMPAT < 0x10100000L

 #  include <openssl/bn.h>

 # endif

+# include <openssl/dherr.h>

+

+# ifdef  __cplusplus

+extern "C" {

+# endif

 

 # ifndef OPENSSL_DH_MAX_MODULUS_BITS

 #  define OPENSSL_DH_MAX_MODULUS_BITS    10000

 # endif

 

+# define OPENSSL_DH_FIPS_MIN_MODULUS_BITS 1024

+

 # define DH_FLAG_CACHE_MONT_P     0x01

 

+# if OPENSSL_API_COMPAT < 0x10100000L

 /*

- * new with 0.9.7h; the built-in DH

- * implementation now uses constant time

- * modular exponentiation for secret exponents

- * by default. This flag causes the

- * faster variable sliding window method to

- * be used for all exponents.

+ * Does nothing. Previously this switched off constant time behaviour.

  */

-# define DH_FLAG_NO_EXP_CONSTTIME 0x02

+#  define DH_FLAG_NO_EXP_CONSTTIME 0x00

+# endif

 

 /*

  * If this flag is set the DH method is FIPS compliant and can be used in

  * FIPS mode. This is set in the validated module method. If an application

- * sets this flag in its own methods it is its reposibility to ensure the

+ * sets this flag in its own methods it is its responsibility to ensure the

  * result is compliant.

  */

 

@@ -106,57 +58,11 @@
 

 # define DH_FLAG_NON_FIPS_ALLOW                  0x0400

 

-#ifdef  __cplusplus

-extern "C" {

-#endif

-

 /* Already defined in ossl_typ.h */

 /* typedef struct dh_st DH; */

 /* typedef struct dh_method DH_METHOD; */

 

-struct dh_method {

-    const char *name;

-    /* Methods here */

-    int (*generate_key) (DH *dh);

-    int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh);

-    /* Can be null */

-    int (*bn_mod_exp) (const DH *dh, BIGNUM *r, const BIGNUM *a,

-                       const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx,

-                       BN_MONT_CTX *m_ctx);

-    int (*init) (DH *dh);

-    int (*finish) (DH *dh);

-    int flags;

-    char *app_data;

-    /* If this is non-NULL, it will be used to generate parameters */

-    int (*generate_params) (DH *dh, int prime_len, int generator,

-                            BN_GENCB *cb);

-};

-

-struct dh_st {

-    /*

-     * This first argument is used to pick up errors when a DH is passed

-     * instead of a EVP_PKEY

-     */

-    int pad;

-    int version;

-    BIGNUM *p;

-    BIGNUM *g;

-    long length;                /* optional */

-    BIGNUM *pub_key;            /* g^x % p */

-    BIGNUM *priv_key;           /* x */

-    int flags;

-    BN_MONT_CTX *method_mont_p;

-    /* Place holders if we want to do X9.42 DH */

-    BIGNUM *q;

-    BIGNUM *j;

-    unsigned char *seed;

-    int seedlen;

-    BIGNUM *counter;

-    int references;

-    CRYPTO_EX_DATA ex_data;

-    const DH_METHOD *meth;

-    ENGINE *engine;

-};

+DECLARE_ASN1_ITEM(DHparams)

 

 # define DH_GENERATOR_2          2

 /* #define DH_GENERATOR_3       3 */

@@ -218,22 +124,28 @@ DH *DH_new_method(ENGINE *engine);
 DH *DH_new(void);

 void DH_free(DH *dh);

 int DH_up_ref(DH *dh);

+int DH_bits(const DH *dh);

 int DH_size(const DH *dh);

-int DH_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,

-                        CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func);

+int DH_security_bits(const DH *dh);

+#define DH_get_ex_new_index(l, p, newf, dupf, freef) \

+    CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_DH, l, p, newf, dupf, freef)

 int DH_set_ex_data(DH *d, int idx, void *arg);

 void *DH_get_ex_data(DH *d, int idx);

 

 /* Deprecated version */

-# ifndef OPENSSL_NO_DEPRECATED

-DH *DH_generate_parameters(int prime_len, int generator,

-                           void (*callback) (int, int, void *), void *cb_arg);

-# endif                         /* !defined(OPENSSL_NO_DEPRECATED) */

+DEPRECATEDIN_0_9_8(DH *DH_generate_parameters(int prime_len, int generator,

+                                              void (*callback) (int, int,

+                                                                void *),

+                                              void *cb_arg))

 

 /* New version */

 int DH_generate_parameters_ex(DH *dh, int prime_len, int generator,

                               BN_GENCB *cb);

 

+int DH_check_params_ex(const DH *dh);

+int DH_check_ex(const DH *dh);

+int DH_check_pub_key_ex(const DH *dh, const BIGNUM *pub_key);

+int DH_check_params(const DH *dh, int *ret);

 int DH_check(const DH *dh, int *codes);

 int DH_check_pub_key(const DH *dh, const BIGNUM *pub_key, int *codes);

 int DH_generate_key(DH *dh);

@@ -243,20 +155,20 @@ DH *d2i_DHparams(DH **a, const unsigned char **pp, long length);
 int i2d_DHparams(const DH *a, unsigned char **pp);

 DH *d2i_DHxparams(DH **a, const unsigned char **pp, long length);

 int i2d_DHxparams(const DH *a, unsigned char **pp);

-# ifndef OPENSSL_NO_FP_API

+# ifndef OPENSSL_NO_STDIO

 int DHparams_print_fp(FILE *fp, const DH *x);

 # endif

-# ifndef OPENSSL_NO_BIO

 int DHparams_print(BIO *bp, const DH *x);

-# else

-int DHparams_print(char *bp, const DH *x);

-# endif

 

 /* RFC 5114 parameters */

 DH *DH_get_1024_160(void);

 DH *DH_get_2048_224(void);

 DH *DH_get_2048_256(void);

 

+/* Named parameters, currently RFC7919 */

+DH *DH_new_by_nid(int nid);

+int DH_get_nid(const DH *dh);

+

 # ifndef OPENSSL_NO_CMS

 /* RFC2631 KDF */

 int DH_KDF_X9_42(unsigned char *out, size_t outlen,

@@ -265,6 +177,55 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
                  const unsigned char *ukm, size_t ukmlen, const EVP_MD *md);

 # endif

 

+void DH_get0_pqg(const DH *dh,

+                 const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);

+int DH_set0_pqg(DH *dh, BIGNUM *p, BIGNUM *q, BIGNUM *g);

+void DH_get0_key(const DH *dh,

+                 const BIGNUM **pub_key, const BIGNUM **priv_key);

+int DH_set0_key(DH *dh, BIGNUM *pub_key, BIGNUM *priv_key);

+const BIGNUM *DH_get0_p(const DH *dh);

+const BIGNUM *DH_get0_q(const DH *dh);

+const BIGNUM *DH_get0_g(const DH *dh);

+const BIGNUM *DH_get0_priv_key(const DH *dh);

+const BIGNUM *DH_get0_pub_key(const DH *dh);

+void DH_clear_flags(DH *dh, int flags);

+int DH_test_flags(const DH *dh, int flags);

+void DH_set_flags(DH *dh, int flags);

+ENGINE *DH_get0_engine(DH *d);

+long DH_get_length(const DH *dh);

+int DH_set_length(DH *dh, long length);

+

+DH_METHOD *DH_meth_new(const char *name, int flags);

+void DH_meth_free(DH_METHOD *dhm);

+DH_METHOD *DH_meth_dup(const DH_METHOD *dhm);

+const char *DH_meth_get0_name(const DH_METHOD *dhm);

+int DH_meth_set1_name(DH_METHOD *dhm, const char *name);

+int DH_meth_get_flags(const DH_METHOD *dhm);

+int DH_meth_set_flags(DH_METHOD *dhm, int flags);

+void *DH_meth_get0_app_data(const DH_METHOD *dhm);

+int DH_meth_set0_app_data(DH_METHOD *dhm, void *app_data);

+int (*DH_meth_get_generate_key(const DH_METHOD *dhm)) (DH *);

+int DH_meth_set_generate_key(DH_METHOD *dhm, int (*generate_key) (DH *));

+int (*DH_meth_get_compute_key(const DH_METHOD *dhm))

+        (unsigned char *key, const BIGNUM *pub_key, DH *dh);

+int DH_meth_set_compute_key(DH_METHOD *dhm,

+        int (*compute_key) (unsigned char *key, const BIGNUM *pub_key, DH *dh));

+int (*DH_meth_get_bn_mod_exp(const DH_METHOD *dhm))

+    (const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,

+     BN_CTX *, BN_MONT_CTX *);

+int DH_meth_set_bn_mod_exp(DH_METHOD *dhm,

+    int (*bn_mod_exp) (const DH *, BIGNUM *, const BIGNUM *, const BIGNUM *,

+                       const BIGNUM *, BN_CTX *, BN_MONT_CTX *));

+int (*DH_meth_get_init(const DH_METHOD *dhm))(DH *);

+int DH_meth_set_init(DH_METHOD *dhm, int (*init)(DH *));

+int (*DH_meth_get_finish(const DH_METHOD *dhm)) (DH *);

+int DH_meth_set_finish(DH_METHOD *dhm, int (*finish) (DH *));

+int (*DH_meth_get_generate_params(const DH_METHOD *dhm))

+        (DH *, int, int, BN_GENCB *);

+int DH_meth_set_generate_params(DH_METHOD *dhm,

+        int (*generate_params) (DH *, int, int, BN_GENCB *));

+

+

 # define EVP_PKEY_CTX_set_dh_paramgen_prime_len(ctx, len) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_PARAMGEN, \

                         EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN, len, NULL)

@@ -289,6 +250,15 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, EVP_PKEY_OP_PARAMGEN, \

                         EVP_PKEY_CTRL_DH_RFC5114, gen, NULL)

 

+# define EVP_PKEY_CTX_set_dh_nid(ctx, nid) \

+        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, \

+                        EVP_PKEY_OP_PARAMGEN | EVP_PKEY_OP_KEYGEN, \

+                        EVP_PKEY_CTRL_DH_NID, nid, NULL)

+

+# define EVP_PKEY_CTX_set_dh_pad(ctx, pad) \

+        EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DH, EVP_PKEY_OP_DERIVE, \

+                          EVP_PKEY_CTRL_DH_PAD, pad, NULL)

+

 # define EVP_PKEY_CTX_set_dh_kdf_type(ctx, kdf) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

@@ -302,22 +272,22 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
 # define EVP_PKEY_CTX_set0_dh_kdf_oid(ctx, oid) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                                EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)oid)

+                                EVP_PKEY_CTRL_DH_KDF_OID, 0, (void *)(oid))

 

 # define EVP_PKEY_CTX_get0_dh_kdf_oid(ctx, poid) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                                EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)poid)

+                                EVP_PKEY_CTRL_GET_DH_KDF_OID, 0, (void *)(poid))

 

 # define EVP_PKEY_CTX_set_dh_kdf_md(ctx, md) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                                EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)md)

+                                EVP_PKEY_CTRL_DH_KDF_MD, 0, (void *)(md))

 

 # define EVP_PKEY_CTX_get_dh_kdf_md(ctx, pmd) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                                EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)pmd)

+                                EVP_PKEY_CTRL_GET_DH_KDF_MD, 0, (void *)(pmd))

 

 # define EVP_PKEY_CTX_set_dh_kdf_outlen(ctx, len) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

@@ -327,17 +297,17 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
 # define EVP_PKEY_CTX_get_dh_kdf_outlen(ctx, plen) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, 0, (void *)plen)

+                        EVP_PKEY_CTRL_GET_DH_KDF_OUTLEN, 0, (void *)(plen))

 

 # define EVP_PKEY_CTX_set0_dh_kdf_ukm(ctx, p, plen) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                                EVP_PKEY_CTRL_DH_KDF_UKM, plen, (void *)p)

+                                EVP_PKEY_CTRL_DH_KDF_UKM, plen, (void *)(p))

 

 # define EVP_PKEY_CTX_get0_dh_kdf_ukm(ctx, p) \

         EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DHX, \

                                 EVP_PKEY_OP_DERIVE, \

-                                EVP_PKEY_CTRL_GET_DH_KDF_UKM, 0, (void *)p)

+                                EVP_PKEY_CTRL_GET_DH_KDF_UKM, 0, (void *)(p))

 

 # define EVP_PKEY_CTRL_DH_PARAMGEN_PRIME_LEN     (EVP_PKEY_ALG_CTRL + 1)

 # define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)

@@ -353,60 +323,18 @@ int DH_KDF_X9_42(unsigned char *out, size_t outlen,
 # define EVP_PKEY_CTRL_GET_DH_KDF_UKM            (EVP_PKEY_ALG_CTRL + 12)

 # define EVP_PKEY_CTRL_DH_KDF_OID                (EVP_PKEY_ALG_CTRL + 13)

 # define EVP_PKEY_CTRL_GET_DH_KDF_OID            (EVP_PKEY_ALG_CTRL + 14)

+# define EVP_PKEY_CTRL_DH_NID                    (EVP_PKEY_ALG_CTRL + 15)

+# define EVP_PKEY_CTRL_DH_PAD                    (EVP_PKEY_ALG_CTRL + 16)

 

 /* KDF types */

 # define EVP_PKEY_DH_KDF_NONE                            1

+# ifndef OPENSSL_NO_CMS

 # define EVP_PKEY_DH_KDF_X9_42                           2

+# endif

 

-/* BEGIN ERROR CODES */

-/*

- * The following lines are auto generated by the script mkerr.pl. Any changes

- * made after this point may be overwritten when the script is next run.

- */

-void ERR_load_DH_strings(void);

-

-/* Error codes for the DH functions. */

-

-/* Function codes. */

-# define DH_F_COMPUTE_KEY                                 102

-# define DH_F_DHPARAMS_PRINT_FP                           101

-# define DH_F_DH_BUILTIN_GENPARAMS                        106

-# define DH_F_DH_CMS_DECRYPT                              117

-# define DH_F_DH_CMS_SET_PEERKEY                          118

-# define DH_F_DH_CMS_SET_SHARED_INFO                      119

-# define DH_F_DH_COMPUTE_KEY                              114

-# define DH_F_DH_GENERATE_KEY                             115

-# define DH_F_DH_GENERATE_PARAMETERS_EX                   116

-# define DH_F_DH_NEW_METHOD                               105

-# define DH_F_DH_PARAM_DECODE                             107

-# define DH_F_DH_PRIV_DECODE                              110

-# define DH_F_DH_PRIV_ENCODE                              111

-# define DH_F_DH_PUB_DECODE                               108

-# define DH_F_DH_PUB_ENCODE                               109

-# define DH_F_DO_DH_PRINT                                 100

-# define DH_F_GENERATE_KEY                                103

-# define DH_F_GENERATE_PARAMETERS                         104

-# define DH_F_PKEY_DH_DERIVE                              112

-# define DH_F_PKEY_DH_KEYGEN                              113

-

-/* Reason codes. */

-# define DH_R_BAD_GENERATOR                               101

-# define DH_R_BN_DECODE_ERROR                             109

-# define DH_R_BN_ERROR                                    106

-# define DH_R_DECODE_ERROR                                104

-# define DH_R_INVALID_PUBKEY                              102

-# define DH_R_KDF_PARAMETER_ERROR                         112

-# define DH_R_KEYS_NOT_SET                                108

-# define DH_R_KEY_SIZE_TOO_SMALL                          110

-# define DH_R_MODULUS_TOO_LARGE                           103

-# define DH_R_NON_FIPS_METHOD                             111

-# define DH_R_NO_PARAMETERS_SET                           107

-# define DH_R_NO_PRIVATE_VALUE                            100

-# define DH_R_PARAMETER_ENCODING_ERROR                    105

-# define DH_R_PEER_KEY_ERROR                              113

-# define DH_R_SHARED_INFO_ERROR                           114

-

-#ifdef  __cplusplus

+

+#  ifdef  __cplusplus

 }

-#endif

+#  endif

+# endif

 #endif