7 files changed, 38 insertions, 55 deletions

diff --git a/src/lib/libcrypto/dh/dh_ameth.c b/src/lib/libcrypto/dh/dh_ameth.c
index 24c8bb25ec..0402092a4f 100644
--- a/src/lib/libcrypto/dh/dh_ameth.c
+++ b/src/lib/libcrypto/dh/dh_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_ameth.c,v 1.13 2015/01/08 01:44:29 doug Exp $ */
+/* $OpenBSD: dh_ameth.c,v 1.14 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -89,7 +89,7 @@ dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
         X509_ALGOR_get0(NULL, &ptype, &pval, palg);
 
         if (ptype != V_ASN1_SEQUENCE) {
-                DHerr(DH_F_DH_PUB_DECODE, DH_R_PARAMETER_ENCODING_ERROR);
+                DHerror(DH_R_PARAMETER_ENCODING_ERROR);
                 goto err;
         }
 
@@ -98,18 +98,18 @@ dh_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
         pmlen = pstr->length;
 
         if (!(dh = d2i_DHparams(NULL, &pm, pmlen))) {
-                DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR);
+                DHerror(DH_R_DECODE_ERROR);
                 goto err;
         }
 
         if (!(public_key=d2i_ASN1_INTEGER(NULL, &p, pklen))) {
-                DHerr(DH_F_DH_PUB_DECODE, DH_R_DECODE_ERROR);
+                DHerror(DH_R_DECODE_ERROR);
                 goto err;
         }
 
         /* We have parameters now set public key */
         if (!(dh->pub_key = ASN1_INTEGER_to_BN(public_key, NULL))) {
-                DHerr(DH_F_DH_PUB_DECODE, DH_R_BN_DECODE_ERROR);
+                DHerror(DH_R_BN_DECODE_ERROR);
                 goto err;
         }
 
@@ -138,13 +138,13 @@ dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 
         str = ASN1_STRING_new();
         if (str == NULL) {
-                DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+                DHerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
         str->length = i2d_DHparams(dh, &str->data);
         if (str->length <= 0) {
-                DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+                DHerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         ptype = V_ASN1_SEQUENCE;
@@ -158,7 +158,7 @@ dh_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
         ASN1_INTEGER_free(pub_key);
 
         if (penclen <= 0) {
-                DHerr(DH_F_DH_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+                DHerror(ERR_R_MALLOC_FAILURE);
                 goto err;
                 }
 
@@ -209,7 +209,7 @@ dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
                 goto decerr;
         /* We have parameters now set private key */
         if (!(dh->priv_key = ASN1_INTEGER_to_BN(privkey, NULL))) {
-                DHerr(DH_F_DH_PRIV_DECODE, DH_R_BN_ERROR);
+                DHerror(DH_R_BN_ERROR);
                 goto dherr;
         }
         /* Calculate public key */
@@ -223,7 +223,7 @@ dh_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
         return 1;
 
 decerr:
-        DHerr(DH_F_DH_PRIV_DECODE, EVP_R_DECODE_ERROR);
+        DHerror(EVP_R_DECODE_ERROR);
 dherr:
         DH_free(dh);
         return 0;
@@ -240,13 +240,13 @@ dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
         params = ASN1_STRING_new();
 
         if (!params) {
-                DHerr(DH_F_DH_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
+                DHerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
         params->length = i2d_DHparams(pkey->pkey.dh, &params->data);
         if (params->length <= 0) {
-                DHerr(DH_F_DH_PRIV_ENCODE,ERR_R_MALLOC_FAILURE);
+                DHerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         params->type = V_ASN1_SEQUENCE;
@@ -255,7 +255,7 @@ dh_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
         prkey = BN_to_ASN1_INTEGER(pkey->pkey.dh->priv_key, NULL);
 
         if (!prkey) {
-                DHerr(DH_F_DH_PRIV_ENCODE, DH_R_BN_ERROR);
+                DHerror(DH_R_BN_ERROR);
                 goto err;
         }
 
@@ -294,7 +294,7 @@ dh_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
         DH *dh;
 
         if (!(dh = d2i_DHparams(NULL, pder, derlen))) {
-                DHerr(DH_F_DH_PARAM_DECODE, ERR_R_DH_LIB);
+                DHerror(ERR_R_DH_LIB);
                 return 0;
         }
         EVP_PKEY_assign_DH(pkey, dh);
@@ -374,7 +374,7 @@ do_dh_print(BIO *bp, const DH *x, int indent, ASN1_PCTX *ctx, int ptype)
         ret = 1;
         if (0) {
 err:
-                DHerr(DH_F_DO_DH_PRINT,reason);
+                DHerror(reason);
         }
         free(m);
         return(ret);
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c
index 3774ba3c45..497f88436e 100644
--- a/src/lib/libcrypto/dh/dh_err.c
+++ b/src/lib/libcrypto/dh/dh_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_err.c,v 1.15 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: dh_err.c,v 1.16 2017/01/29 17:49:22 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -71,27 +71,10 @@
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason)
 
-static ERR_STRING_DATA DH_str_functs[]=
-        {
-{ERR_FUNC(DH_F_COMPUTE_KEY),    "COMPUTE_KEY"},
-{ERR_FUNC(DH_F_DHPARAMS_PRINT_FP),      "DHparams_print_fp"},
-{ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS),   "DH_BUILTIN_GENPARAMS"},
-{ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"},
-{ERR_FUNC(DH_F_DH_GENERATE_KEY),        "DH_generate_key"},
-{ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS_EX),      "DH_generate_parameters_ex"},
-{ERR_FUNC(DH_F_DH_NEW_METHOD),  "DH_new_method"},
-{ERR_FUNC(DH_F_DH_PARAM_DECODE),        "DH_PARAM_DECODE"},
-{ERR_FUNC(DH_F_DH_PRIV_DECODE), "DH_PRIV_DECODE"},
-{ERR_FUNC(DH_F_DH_PRIV_ENCODE), "DH_PRIV_ENCODE"},
-{ERR_FUNC(DH_F_DH_PUB_DECODE),  "DH_PUB_DECODE"},
-{ERR_FUNC(DH_F_DH_PUB_ENCODE),  "DH_PUB_ENCODE"},
-{ERR_FUNC(DH_F_DO_DH_PRINT),    "DO_DH_PRINT"},
-{ERR_FUNC(DH_F_GENERATE_KEY),   "GENERATE_KEY"},
-{ERR_FUNC(DH_F_GENERATE_PARAMETERS),    "GENERATE_PARAMETERS"},
-{ERR_FUNC(DH_F_PKEY_DH_DERIVE), "PKEY_DH_DERIVE"},
-{ERR_FUNC(DH_F_PKEY_DH_KEYGEN), "PKEY_DH_KEYGEN"},
-{0,NULL}
-        };
+static ERR_STRING_DATA DH_str_functs[]= {
+        {ERR_FUNC(0xfff), "CRYPTO_internal"},
+        {0, NULL}
+};
 
 static ERR_STRING_DATA DH_str_reasons[]=
         {
diff --git a/src/lib/libcrypto/dh/dh_gen.c b/src/lib/libcrypto/dh/dh_gen.c
index de566802d3..99394113ee 100644
--- a/src/lib/libcrypto/dh/dh_gen.c
+++ b/src/lib/libcrypto/dh/dh_gen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_gen.c,v 1.15 2015/02/09 15:49:22 jsing Exp $ */
+/* $OpenBSD: dh_gen.c,v 1.16 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -127,7 +127,7 @@ dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb)
                 goto err;
         
         if (generator <= 1) {
-                DHerr(DH_F_DH_BUILTIN_GENPARAMS, DH_R_BAD_GENERATOR);
+                DHerror(DH_R_BAD_GENERATOR);
                 goto err;
         }
         if (generator == DH_GENERATOR_2) {
@@ -167,7 +167,7 @@ dh_builtin_genparams(DH *ret, int prime_len, int generator, BN_GENCB *cb)
         ok = 1;
 err:
         if (ok == -1) {
-                DHerr(DH_F_DH_BUILTIN_GENPARAMS, ERR_R_BN_LIB);
+                DHerror(ERR_R_BN_LIB);
                 ok = 0;
         }
 
diff --git a/src/lib/libcrypto/dh/dh_key.c b/src/lib/libcrypto/dh/dh_key.c
index 5b365cdd06..63d38771c3 100644
--- a/src/lib/libcrypto/dh/dh_key.c
+++ b/src/lib/libcrypto/dh/dh_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_key.c,v 1.26 2017/01/21 09:38:58 beck Exp $ */
+/* $OpenBSD: dh_key.c,v 1.27 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -165,7 +165,7 @@ generate_key(DH *dh)
         ok = 1;
 err:
         if (ok != 1)
-                DHerr(DH_F_GENERATE_KEY, ERR_R_BN_LIB);
+                DHerror(ERR_R_BN_LIB);
 
         if (pub_key != NULL && dh->pub_key == NULL)
                 BN_free(pub_key);
@@ -185,7 +185,7 @@ compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
         int check_result;
 
         if (BN_num_bits(dh->p) > OPENSSL_DH_MAX_MODULUS_BITS) {
-                DHerr(DH_F_COMPUTE_KEY, DH_R_MODULUS_TOO_LARGE);
+                DHerror(DH_R_MODULUS_TOO_LARGE);
                 goto err;
         }
 
@@ -197,7 +197,7 @@ compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
                 goto err;
         
         if (dh->priv_key == NULL) {
-                DHerr(DH_F_COMPUTE_KEY, DH_R_NO_PRIVATE_VALUE);
+                DHerror(DH_R_NO_PRIVATE_VALUE);
                 goto err;
         }
 
@@ -212,13 +212,13 @@ compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
         }
 
         if (!DH_check_pub_key(dh, pub_key, &check_result) || check_result) {
-                DHerr(DH_F_COMPUTE_KEY, DH_R_INVALID_PUBKEY);
+                DHerror(DH_R_INVALID_PUBKEY);
                 goto err;
         }
 
         if (!dh->meth->bn_mod_exp(dh, tmp, pub_key, dh->priv_key, dh->p, ctx,
             mont)) {
-                DHerr(DH_F_COMPUTE_KEY, ERR_R_BN_LIB);
+                DHerror(ERR_R_BN_LIB);
                 goto err;
         }
 
diff --git a/src/lib/libcrypto/dh/dh_lib.c b/src/lib/libcrypto/dh/dh_lib.c
index defe1c74b4..d45dc17168 100644
--- a/src/lib/libcrypto/dh/dh_lib.c
+++ b/src/lib/libcrypto/dh/dh_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_lib.c,v 1.21 2015/02/11 03:19:37 doug Exp $ */
+/* $OpenBSD: dh_lib.c,v 1.22 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -121,7 +121,7 @@ DH_new_method(ENGINE *engine)
 
         ret = malloc(sizeof(DH));
         if (ret == NULL) {
-                DHerr(DH_F_DH_NEW_METHOD, ERR_R_MALLOC_FAILURE);
+                DHerror(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
 
@@ -129,7 +129,7 @@ DH_new_method(ENGINE *engine)
 #ifndef OPENSSL_NO_ENGINE
         if (engine) {
                 if (!ENGINE_init(engine)) {
-                        DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        DHerror(ERR_R_ENGINE_LIB);
                         free(ret);
                         return NULL;
                 }
@@ -139,7 +139,7 @@ DH_new_method(ENGINE *engine)
         if(ret->engine) {
                 ret->meth = ENGINE_get_DH(ret->engine);
                 if (!ret->meth) {
-                        DHerr(DH_F_DH_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        DHerror(ERR_R_ENGINE_LIB);
                         ENGINE_finish(ret->engine);
                         free(ret);
                         return NULL;
diff --git a/src/lib/libcrypto/dh/dh_pmeth.c b/src/lib/libcrypto/dh/dh_pmeth.c
index 6d750eb30d..24d16ff5d3 100644
--- a/src/lib/libcrypto/dh/dh_pmeth.c
+++ b/src/lib/libcrypto/dh/dh_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_pmeth.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_pmeth.c,v 1.10 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -215,7 +215,7 @@ pkey_dh_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         DH *dh = NULL;
 
         if (ctx->pkey == NULL) {
-                DHerr(DH_F_PKEY_DH_KEYGEN, DH_R_NO_PARAMETERS_SET);
+                DHerror(DH_R_NO_PARAMETERS_SET);
                 return 0;
         }
         dh = DH_new();
@@ -234,7 +234,7 @@ pkey_dh_derive(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *keylen)
         int ret;
 
         if (!ctx->pkey || !ctx->peerkey) {
-                DHerr(DH_F_PKEY_DH_DERIVE, DH_R_KEYS_NOT_SET);
+                DHerror(DH_R_KEYS_NOT_SET);
                 return 0;
         }
         ret = DH_compute_key(key, ctx->peerkey->pkey.dh->pub_key,
diff --git a/src/lib/libcrypto/dh/dh_prn.c b/src/lib/libcrypto/dh/dh_prn.c
index 73d0476e21..56a96f8631 100644
--- a/src/lib/libcrypto/dh/dh_prn.c
+++ b/src/lib/libcrypto/dh/dh_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_prn.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dh_prn.c,v 1.6 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,7 +69,7 @@ DHparams_print_fp(FILE *fp, const DH *x)
         int ret;
 
         if ((b = BIO_new(BIO_s_file())) == NULL) {
-                DHerr(DH_F_DHPARAMS_PRINT_FP, ERR_R_BUF_LIB);
+                DHerror(ERR_R_BUF_LIB);
                 return 0;
         }
         BIO_set_fp(b,fp,BIO_NOCLOSE);