Add KDF error codes Reviewed-by: Rich Salz <rsalz@openssl.org>
diff --git a/crypto/err/err.c b/crypto/err/err.c index 1547181..181882d 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c
@@ -157,6 +157,7 @@ {ERR_PACK(ERR_LIB_HMAC, 0, 0), "HMAC routines"}, {ERR_PACK(ERR_LIB_CT, 0, 0), "CT routines"}, {ERR_PACK(ERR_LIB_ASYNC, 0, 0), "ASYNC routines"}, + {ERR_PACK(ERR_LIB_KDF, 0, 0), "KDF routines"}, {0, NULL}, };
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c index 345ce44..be6a30e 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c
@@ -102,6 +102,7 @@ # include <openssl/ct.h> #endif #include <openssl/async.h> +#include <openssl/kdf.h> void err_load_crypto_strings_intern(void) { @@ -158,4 +159,5 @@ # endif ERR_load_ASYNC_strings(); #endif + ERR_load_KDF_strings(); }
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index ce9dc5c..2e15660 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec
@@ -35,6 +35,7 @@ L FIPS include/openssl/fips.h crypto/fips_err.h L CT include/openssl/ct.h crypto/ct/ct_err.c L ASYNC include/openssl/async.h crypto/async/async_err.c +L KDF include/openssl/kdf.h crypto/kdf/kdf_err.c # additional header files to be scanned for function names L NONE crypto/x509/x509_vfy.h NONE
diff --git a/crypto/kdf/Makefile.in b/crypto/kdf/Makefile.in index be4e08c..44d5762 100644 --- a/crypto/kdf/Makefile.in +++ b/crypto/kdf/Makefile.in
@@ -15,8 +15,8 @@ GENERAL=Makefile LIB=$(TOP)/libcrypto.a -LIBSRC=tls1_prf.c -LIBOBJ=tls1_prf.o +LIBSRC=tls1_prf.c kdf_err.c +LIBOBJ=tls1_prf.o kdf_err.o SRC= $(LIBSRC)
diff --git a/crypto/kdf/build.info b/crypto/kdf/build.info index 8b6d9ee..320f534 100644 --- a/crypto/kdf/build.info +++ b/crypto/kdf/build.info
@@ -1,3 +1,3 @@ LIBS=../../libcrypto SOURCE[../../libcrypto]=\ - tls1_prf.c + tls1_prf.c kdf_err.c
diff --git a/crypto/kdf/kdf_err.c b/crypto/kdf/kdf_err.c new file mode 100644 index 0000000..b0321c5 --- /dev/null +++ b/crypto/kdf/kdf_err.c
@@ -0,0 +1,95 @@ +/* ==================================================================== + * Copyright (c) 1999-2016 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). + * + */ + +/* + * NOTE: this file was auto generated by the mkerr.pl script: any changes + * made to it will be overwritten when the script next updates this file, + * only reason strings will be preserved. + */ + +#include <stdio.h> +#include <openssl/err.h> +#include <openssl/kdf.h> + +/* BEGIN ERROR CODES */ +#ifndef OPENSSL_NO_ERR + +# define ERR_FUNC(func) ERR_PACK(ERR_LIB_KDF,func,0) +# define ERR_REASON(reason) ERR_PACK(ERR_LIB_KDF,0,reason) + +static ERR_STRING_DATA KDF_str_functs[] = { + {ERR_FUNC(KDF_F_PKEY_TLS1_PRF_CTRL_STR), "pkey_tls1_prf_ctrl_str"}, + {ERR_FUNC(KDF_F_PKEY_TLS1_PRF_DERIVE), "pkey_tls1_prf_derive"}, + {0, NULL} +}; + +static ERR_STRING_DATA KDF_str_reasons[] = { + {ERR_REASON(KDF_R_INVALID_DIGEST), "invalid digest"}, + {ERR_REASON(KDF_R_MISSING_PARAMETER), "missing parameter"}, + {ERR_REASON(KDF_R_VALUE_MISSING), "value missing"}, + {0, NULL} +}; + +#endif + +void ERR_load_KDF_strings(void) +{ +#ifndef OPENSSL_NO_ERR + + if (ERR_func_error_string(KDF_str_functs[0].error) == NULL) { + ERR_load_strings(0, KDF_str_functs); + ERR_load_strings(0, KDF_str_reasons); + } +#endif +}
diff --git a/crypto/kdf/tls1_prf.c b/crypto/kdf/tls1_prf.c index 1302eb0..4b40c88 100644 --- a/crypto/kdf/tls1_prf.c +++ b/crypto/kdf/tls1_prf.c
@@ -141,14 +141,18 @@ static int pkey_tls1_prf_ctrl_str(EVP_PKEY_CTX *ctx, const char *type, const char *value) { - if (value == NULL) + if (value == NULL) { + KDFerr(KDF_F_PKEY_TLS1_PRF_CTRL_STR, KDF_R_VALUE_MISSING); return 0; + } if (strcmp(type, "md") == 0) { TLS1_PRF_PKEY_CTX *kctx = ctx->data; const EVP_MD *md = EVP_get_digestbyname(value); - if (md == NULL) + if (md == NULL) { + KDFerr(KDF_F_PKEY_TLS1_PRF_CTRL_STR, KDF_R_INVALID_DIGEST); return 0; + } kctx->md = md; return 1; } @@ -167,8 +171,10 @@ size_t *keylen) { TLS1_PRF_PKEY_CTX *kctx = ctx->data; - if (kctx->md == NULL || kctx->sec == NULL || kctx->seedlen == 0) + if (kctx->md == NULL || kctx->sec == NULL || kctx->seedlen == 0) { + KDFerr(KDF_F_PKEY_TLS1_PRF_DERIVE, KDF_R_MISSING_PARAMETER); return 0; + } return tls1_prf_alg(kctx->md, kctx->sec, kctx->seclen, kctx->seed, kctx->seedlen, key, *keylen);