7 files changed, 50 insertions, 76 deletions

diff --git a/src/lib/libcrypto/dsa/dsa_ameth.c b/src/lib/libcrypto/dsa/dsa_ameth.c
index b589d39892..92f543de9e 100644
--- a/src/lib/libcrypto/dsa/dsa_ameth.c
+++ b/src/lib/libcrypto/dsa/dsa_ameth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_ameth.c,v 1.22 2017/01/21 10:38:29 beck Exp $ */
+/* $OpenBSD: dsa_ameth.c,v 1.23 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -92,26 +92,26 @@ dsa_pub_decode(EVP_PKEY *pkey, X509_PUBKEY *pubkey)
                 pmlen = pstr->length;
 
                 if (!(dsa = d2i_DSAparams(NULL, &pm, pmlen))) {
-                        DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_DECODE_ERROR);
+                        DSAerror(DSA_R_DECODE_ERROR);
                         goto err;
                 }
         } else if (ptype == V_ASN1_NULL || ptype == V_ASN1_UNDEF) {
                 if (!(dsa = DSA_new())) {
-                        DSAerr(DSA_F_DSA_PUB_DECODE, ERR_R_MALLOC_FAILURE);
+                        DSAerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                         }
         } else {
-                DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_PARAMETER_ENCODING_ERROR);
+                DSAerror(DSA_R_PARAMETER_ENCODING_ERROR);
                 goto err;
         }
 
         if (!(public_key=d2i_ASN1_INTEGER(NULL, &p, pklen))) {
-                DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_DECODE_ERROR);
+                DSAerror(DSA_R_DECODE_ERROR);
                 goto err;
         }
 
         if (!(dsa->pub_key = ASN1_INTEGER_to_BN(public_key, NULL))) {
-                DSAerr(DSA_F_DSA_PUB_DECODE, DSA_R_BN_DECODE_ERROR);
+                DSAerror(DSA_R_BN_DECODE_ERROR);
                 goto err;
         }
 
@@ -141,12 +141,12 @@ dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
 
                 str = ASN1_STRING_new();
                 if (str == NULL) {
-                        DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+                        DSAerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
                 str->length = i2d_DSAparams(dsa, &str->data);
                 if (str->length <= 0) {
-                        DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+                        DSAerror(ERR_R_MALLOC_FAILURE);
                         ASN1_STRING_free(str);
                         goto err;
                 }
@@ -160,7 +160,7 @@ dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
         penclen = i2d_DSAPublicKey(dsa, &penc);
 
         if (penclen <= 0) {
-                DSAerr(DSA_F_DSA_PUB_ENCODE, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -211,21 +211,21 @@ dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
                 goto decerr;
         /* We have parameters now set private key */
         if (!(dsa->priv_key = ASN1_INTEGER_to_BN(privkey, NULL))) {
-                DSAerr(DSA_F_DSA_PRIV_DECODE,DSA_R_BN_ERROR);
+                DSAerror(DSA_R_BN_ERROR);
                 goto dsaerr;
         }
         /* Calculate public key */
         if (!(dsa->pub_key = BN_new())) {
-                DSAerr(DSA_F_DSA_PRIV_DECODE, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 goto dsaerr;
         }
         if (!(ctx = BN_CTX_new())) {
-                DSAerr(DSA_F_DSA_PRIV_DECODE, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 goto dsaerr;
         }
 
         if (!BN_mod_exp_ct(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) {
-                DSAerr(DSA_F_DSA_PRIV_DECODE,DSA_R_BN_ERROR);
+                DSAerror(DSA_R_BN_ERROR);
                 goto dsaerr;
         }
 
@@ -236,7 +236,7 @@ dsa_priv_decode(EVP_PKEY *pkey, PKCS8_PRIV_KEY_INFO *p8)
         goto done;
 
 decerr:
-        DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_DECODE_ERROR);
+        DSAerror(DSA_R_DECODE_ERROR);
 dsaerr:
         DSA_free(dsa);
 done:
@@ -255,13 +255,13 @@ dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 
         params = ASN1_STRING_new();
         if (!params) {
-                DSAerr(DSA_F_DSA_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
         params->length = i2d_DSAparams(pkey->pkey.dsa, &params->data);
         if (params->length <= 0) {
-                DSAerr(DSA_F_DSA_PRIV_ENCODE, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
         params->type = V_ASN1_SEQUENCE;
@@ -269,7 +269,7 @@ dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
         /* Get private key into integer */
         prkey = BN_to_ASN1_INTEGER(pkey->pkey.dsa->priv_key, NULL);
         if (!prkey) {
-                DSAerr(DSA_F_DSA_PRIV_ENCODE, DSA_R_BN_ERROR);
+                DSAerror(DSA_R_BN_ERROR);
                 goto err;
         }
 
@@ -407,7 +407,7 @@ do_dsa_print(BIO *bp, const DSA *x, int off, int ptype)
 
         m = malloc(buf_len + 10);
         if (m == NULL) {
-                DSAerr(DSA_F_DO_DSA_PRINT, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 goto err;
         }
 
@@ -441,7 +441,7 @@ dsa_param_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
         DSA *dsa;
 
         if (!(dsa = d2i_DSAparams(NULL, pder, derlen))) {
-                DSAerr(DSA_F_DSA_PARAM_DECODE, ERR_R_DSA_LIB);
+                DSAerror(ERR_R_DSA_LIB);
                 return 0;
         }
         EVP_PKEY_assign_DSA(pkey, dsa);
@@ -480,7 +480,7 @@ old_dsa_priv_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
         BIGNUM *j, *p1, *newp1;
 
         if (!(dsa = d2i_DSAPrivateKey(NULL, pder, derlen))) {
-                DSAerr(DSA_F_OLD_DSA_PRIV_DECODE, ERR_R_DSA_LIB);
+                DSAerror(ERR_R_DSA_LIB);
                 return 0;
         }
 
@@ -507,7 +507,7 @@ old_dsa_priv_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
         if (BN_mul(newp1, dsa->q, j, ctx) == 0)
                 goto err;
         if (BN_cmp(newp1, p1) != 0) {
-                DSAerr(DSA_F_DSA_PARAM_DECODE, DSA_R_BAD_Q_VALUE);
+                DSAerror(DSA_R_BAD_Q_VALUE);
                 goto err;
         }
 
@@ -516,7 +516,7 @@ old_dsa_priv_decode(EVP_PKEY *pkey, const unsigned char **pder, int derlen)
          */
 
         if (BN_is_prime_ex(dsa->q, BN_prime_checks, ctx, NULL) == 0) {
-                DSAerr(DSA_F_DSA_PARAM_DECODE, DSA_R_BAD_Q_VALUE);
+                DSAerror(DSA_R_BAD_Q_VALUE);
                 goto err;
         }
 
@@ -561,7 +561,7 @@ dsa_sig_print(BIO *bp, const X509_ALGOR *sigalg, const ASN1_STRING *sig,
                 update_buflen(dsa_sig->s, &buf_len);
                 m = malloc(buf_len + 10);
                 if (m == NULL) {
-                        DSAerr(DSA_F_DSA_SIG_PRINT, ERR_R_MALLOC_FAILURE);
+                        DSAerror(ERR_R_MALLOC_FAILURE);
                         goto err;
                 }
 
diff --git a/src/lib/libcrypto/dsa/dsa_asn1.c b/src/lib/libcrypto/dsa/dsa_asn1.c
index 5a1c7ceb71..d7b77470bd 100644
--- a/src/lib/libcrypto/dsa/dsa_asn1.c
+++ b/src/lib/libcrypto/dsa/dsa_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_asn1.c,v 1.18 2016/12/30 15:28:42 jsing Exp $ */
+/* $OpenBSD: dsa_asn1.c,v 1.19 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
@@ -73,7 +73,7 @@ sig_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
 
                 sig = malloc(sizeof(DSA_SIG));
                 if (!sig) {
-                        DSAerr(DSA_F_SIG_CB, ERR_R_MALLOC_FAILURE);
+                        DSAerror(ERR_R_MALLOC_FAILURE);
                         return 0;
                 }
                 sig->r = NULL;
diff --git a/src/lib/libcrypto/dsa/dsa_err.c b/src/lib/libcrypto/dsa/dsa_err.c
index b116b643c3..2dcddcbf77 100644
--- a/src/lib/libcrypto/dsa/dsa_err.c
+++ b/src/lib/libcrypto/dsa/dsa_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_err.c,v 1.14 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: dsa_err.c,v 1.15 2017/01/29 17:49:22 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -71,35 +71,10 @@
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DSA,func,0)
 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DSA,0,reason)
 
-static ERR_STRING_DATA DSA_str_functs[]=
-        {
-{ERR_FUNC(DSA_F_D2I_DSA_SIG),   "d2i_DSA_SIG"},
-{ERR_FUNC(DSA_F_DO_DSA_PRINT),  "DO_DSA_PRINT"},
-{ERR_FUNC(DSA_F_DSAPARAMS_PRINT),       "DSAparams_print"},
-{ERR_FUNC(DSA_F_DSAPARAMS_PRINT_FP),    "DSAparams_print_fp"},
-{ERR_FUNC(DSA_F_DSA_DO_SIGN),   "DSA_do_sign"},
-{ERR_FUNC(DSA_F_DSA_DO_VERIFY), "DSA_do_verify"},
-{ERR_FUNC(DSA_F_DSA_GENERATE_KEY),      "DSA_generate_key"},
-{ERR_FUNC(DSA_F_DSA_GENERATE_PARAMETERS_EX),    "DSA_generate_parameters_ex"},
-{ERR_FUNC(DSA_F_DSA_NEW_METHOD),        "DSA_new_method"},
-{ERR_FUNC(DSA_F_DSA_PARAM_DECODE),      "DSA_PARAM_DECODE"},
-{ERR_FUNC(DSA_F_DSA_PRINT_FP),  "DSA_print_fp"},
-{ERR_FUNC(DSA_F_DSA_PRIV_DECODE),       "DSA_PRIV_DECODE"},
-{ERR_FUNC(DSA_F_DSA_PRIV_ENCODE),       "DSA_PRIV_ENCODE"},
-{ERR_FUNC(DSA_F_DSA_PUB_DECODE),        "DSA_PUB_DECODE"},
-{ERR_FUNC(DSA_F_DSA_PUB_ENCODE),        "DSA_PUB_ENCODE"},
-{ERR_FUNC(DSA_F_DSA_SIGN),      "DSA_sign"},
-{ERR_FUNC(DSA_F_DSA_SIGN_SETUP),        "DSA_sign_setup"},
-{ERR_FUNC(DSA_F_DSA_SIG_NEW),   "DSA_SIG_new"},
-{ERR_FUNC(DSA_F_DSA_SIG_PRINT), "DSA_SIG_PRINT"},
-{ERR_FUNC(DSA_F_DSA_VERIFY),    "DSA_verify"},
-{ERR_FUNC(DSA_F_I2D_DSA_SIG),   "i2d_DSA_SIG"},
-{ERR_FUNC(DSA_F_OLD_DSA_PRIV_DECODE),   "OLD_DSA_PRIV_DECODE"},
-{ERR_FUNC(DSA_F_PKEY_DSA_CTRL), "PKEY_DSA_CTRL"},
-{ERR_FUNC(DSA_F_PKEY_DSA_KEYGEN),       "PKEY_DSA_KEYGEN"},
-{ERR_FUNC(DSA_F_SIG_CB),        "SIG_CB"},
-{0,NULL}
-        };
+static ERR_STRING_DATA DSA_str_functs[]= {
+        {ERR_FUNC(0xfff), "CRYPTO_internal"},
+        {0, NULL}
+};
 
 static ERR_STRING_DATA DSA_str_reasons[]=
         {
diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c
index 8016f2f7cb..58af74889c 100644
--- a/src/lib/libcrypto/dsa/dsa_lib.c
+++ b/src/lib/libcrypto/dsa/dsa_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_lib.c,v 1.22 2015/02/11 03:19:37 doug Exp $ */
+/* $OpenBSD: dsa_lib.c,v 1.23 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -126,14 +126,14 @@ DSA_new_method(ENGINE *engine)
 
         ret = malloc(sizeof(DSA));
         if (ret == NULL) {
-                DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_MALLOC_FAILURE);
+                DSAerror(ERR_R_MALLOC_FAILURE);
                 return NULL;
         }
         ret->meth = DSA_get_default_method();
 #ifndef OPENSSL_NO_ENGINE
         if (engine) {
                 if (!ENGINE_init(engine)) {
-                        DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        DSAerror(ERR_R_ENGINE_LIB);
                         free(ret);
                         return NULL;
                 }
@@ -143,7 +143,7 @@ DSA_new_method(ENGINE *engine)
         if (ret->engine) {
                 ret->meth = ENGINE_get_DSA(ret->engine);
                 if (!ret->meth) {
-                        DSAerr(DSA_F_DSA_NEW_METHOD, ERR_R_ENGINE_LIB);
+                        DSAerror(ERR_R_ENGINE_LIB);
                         ENGINE_finish(ret->engine);
                         free(ret);
                         return NULL;
diff --git a/src/lib/libcrypto/dsa/dsa_ossl.c b/src/lib/libcrypto/dsa/dsa_ossl.c
index f806cd645a..f1013fe547 100644
--- a/src/lib/libcrypto/dsa/dsa_ossl.c
+++ b/src/lib/libcrypto/dsa/dsa_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_ossl.c,v 1.29 2017/01/21 11:00:46 beck Exp $ */
+/* $OpenBSD: dsa_ossl.c,v 1.30 2017/01/29 17:49:22 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -169,7 +169,7 @@ redo:
         
 err:
         if (!ret) {
-                DSAerr(DSA_F_DSA_DO_SIGN, reason);
+                DSAerror(reason);
                 BN_free(r);
                 BN_free(s);
         }
@@ -188,7 +188,7 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
         int ret = 0;
 
         if (!dsa->p || !dsa->q || !dsa->g) {
-                DSAerr(DSA_F_DSA_SIGN_SETUP, DSA_R_MISSING_PARAMETERS);
+                DSAerror(DSA_R_MISSING_PARAMETERS);
                 return 0;
         }
 
@@ -259,7 +259,7 @@ dsa_sign_setup(DSA *dsa, BN_CTX *ctx_in, BIGNUM **kinvp, BIGNUM **rp)
         ret = 1;
 err:
         if (!ret) {
-                DSAerr(DSA_F_DSA_SIGN_SETUP, ERR_R_BN_LIB);
+                DSAerror(ERR_R_BN_LIB);
                 BN_clear_free(r);
         }
         if (ctx_in == NULL)
@@ -277,19 +277,19 @@ dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa)
         int ret = -1, i;
 
         if (!dsa->p || !dsa->q || !dsa->g) {
-                DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_MISSING_PARAMETERS);
+                DSAerror(DSA_R_MISSING_PARAMETERS);
                 return -1;
         }
 
         i = BN_num_bits(dsa->q);
         /* fips 186-3 allows only different sizes for q */
         if (i != 160 && i != 224 && i != 256) {
-                DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_BAD_Q_VALUE);
+                DSAerror(DSA_R_BAD_Q_VALUE);
                 return -1;
         }
 
         if (BN_num_bits(dsa->p) > OPENSSL_DSA_MAX_MODULUS_BITS) {
-                DSAerr(DSA_F_DSA_DO_VERIFY, DSA_R_MODULUS_TOO_LARGE);
+                DSAerror(DSA_R_MODULUS_TOO_LARGE);
                 return -1;
         }
         BN_init(&u1);
@@ -363,7 +363,7 @@ dsa_do_verify(const unsigned char *dgst, int dgst_len, DSA_SIG *sig, DSA *dsa)
 
 err:
         if (ret < 0)
-                DSAerr(DSA_F_DSA_DO_VERIFY, ERR_R_BN_LIB);
+                DSAerror(ERR_R_BN_LIB);
         BN_CTX_free(ctx);
         BN_free(&u1);
         BN_free(&u2);
diff --git a/src/lib/libcrypto/dsa/dsa_pmeth.c b/src/lib/libcrypto/dsa/dsa_pmeth.c
index c7a2edfc94..780b070a72 100644
--- a/src/lib/libcrypto/dsa/dsa_pmeth.c
+++ b/src/lib/libcrypto/dsa/dsa_pmeth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_pmeth.c,v 1.10 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dsa_pmeth.c,v 1.11 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -191,7 +191,7 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                 case NID_sha256:
                         break;
                 default:
-                        DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
+                        DSAerror(DSA_R_INVALID_DIGEST_TYPE);
                         return 0;
                 }
                 dctx->md = p2;
@@ -208,7 +208,7 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                 case NID_sha512:
                         break;
                 default:
-                        DSAerr(DSA_F_PKEY_DSA_CTRL, DSA_R_INVALID_DIGEST_TYPE);
+                        DSAerror(DSA_R_INVALID_DIGEST_TYPE);
                         return 0;
                 }
                 dctx->md = p2;
@@ -220,8 +220,7 @@ pkey_dsa_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2)
                 return 1;
                 
         case EVP_PKEY_CTRL_PEER_KEY:
-                DSAerr(DSA_F_PKEY_DSA_CTRL,
-                    EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
+                DSAerror(EVP_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE);
                 return -2;      
         default:
                 return -2;
@@ -303,7 +302,7 @@ pkey_dsa_keygen(EVP_PKEY_CTX *ctx, EVP_PKEY *pkey)
         DSA *dsa = NULL;
 
         if (ctx->pkey == NULL) {
-                DSAerr(DSA_F_PKEY_DSA_KEYGEN, DSA_R_NO_PARAMETERS_SET);
+                DSAerror(DSA_R_NO_PARAMETERS_SET);
                 return 0;
         }
         dsa = DSA_new();
diff --git a/src/lib/libcrypto/dsa/dsa_prn.c b/src/lib/libcrypto/dsa/dsa_prn.c
index 60f4e6c760..fb5e35f909 100644
--- a/src/lib/libcrypto/dsa/dsa_prn.c
+++ b/src/lib/libcrypto/dsa/dsa_prn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_prn.c,v 1.5 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: dsa_prn.c,v 1.6 2017/01/29 17:49:22 beck Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
@@ -69,7 +69,7 @@ DSA_print_fp(FILE *fp, const DSA *x, int off)
         int ret;
 
         if ((b = BIO_new(BIO_s_file())) == NULL) {
-                DSAerr(DSA_F_DSA_PRINT_FP, ERR_R_BUF_LIB);
+                DSAerror(ERR_R_BUF_LIB);
                 return 0;
         }
         BIO_set_fp(b, fp, BIO_NOCLOSE);
@@ -85,7 +85,7 @@ DSAparams_print_fp(FILE *fp, const DSA *x)
         int ret;
 
         if ((b = BIO_new(BIO_s_file())) == NULL) {
-                DSAerr(DSA_F_DSAPARAMS_PRINT_FP, ERR_R_BUF_LIB);
+                DSAerror(ERR_R_BUF_LIB);
                 return 0;
         }
         BIO_set_fp(b, fp, BIO_NOCLOSE);