From: Dr. Stephen Henson Date: Wed, 2 Mar 2016 04:11:02 +0000 (+0000) Subject: Add KDF error codes X-Git-Tag: OpenSSL_1_1_0-pre4~388 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3e30fa0a6df46b39e0c69b3ab8f9d1c03cab2012;p=oweals%2Fopenssl.git Add KDF error codes Reviewed-by: Rich Salz --- diff --git a/crypto/err/err.c b/crypto/err/err.c index 15471814a1..181882d04e 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -157,6 +157,7 @@ static ERR_STRING_DATA ERR_str_libraries[] = { {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 345ce44023..be6a30e93b 100644 --- a/crypto/err/err_all.c +++ b/crypto/err/err_all.c @@ -102,6 +102,7 @@ # include #endif #include +#include void err_load_crypto_strings_intern(void) { @@ -158,4 +159,5 @@ void err_load_crypto_strings_intern(void) # endif ERR_load_ASYNC_strings(); #endif + ERR_load_KDF_strings(); } diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index ce9dc5c3bc..2e156600ad 100644 --- a/crypto/err/openssl.ec +++ b/crypto/err/openssl.ec @@ -35,6 +35,7 @@ L CMS include/openssl/cms.h crypto/cms/cms_err.c 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 be4e08c1a0..44d57622e0 100644 --- a/crypto/kdf/Makefile.in +++ b/crypto/kdf/Makefile.in @@ -15,8 +15,8 @@ CFLAGS= $(INCLUDES) $(CFLAG) $(SHARED_CFLAG) 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 8b6d9eed41..320f534055 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 0000000000..b0321c51bd --- /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 +#include +#include + +/* 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 1302eb0927..4b40c88ce7 100644 --- a/crypto/kdf/tls1_prf.c +++ b/crypto/kdf/tls1_prf.c @@ -141,14 +141,18 @@ static int pkey_tls1_prf_ctrl(EVP_PKEY_CTX *ctx, int type, int p1, void *p2) 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 @@ static int pkey_tls1_prf_derive(EVP_PKEY_CTX *ctx, unsigned char *key, 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); diff --git a/include/openssl/err.h b/include/openssl/err.h index 8c3b1aa3e4..0b12d927c2 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -194,6 +194,7 @@ typedef struct err_state_st { # define ERR_LIB_JPAKE 49 # define ERR_LIB_CT 50 # define ERR_LIB_ASYNC 51 +# define ERR_LIB_KDF 52 # define ERR_LIB_USER 128 @@ -232,6 +233,7 @@ typedef struct err_state_st { # define JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),OPENSSL_FILE,OPENSSL_LINE) # define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),OPENSSL_FILE,OPENSSL_LINE) +# define KDFerr(f,r) ERR_PUT_error(ERR_LIB_KDF,(f),(r),OPENSSL_FILE,OPENSSL_LINE) /* * Borland C seems too stupid to be able to shift and do longs in the diff --git a/include/openssl/kdf.h b/include/openssl/kdf.h index b28a3f2c4a..a1aed8dd77 100644 --- a/include/openssl/kdf.h +++ b/include/openssl/kdf.h @@ -74,6 +74,24 @@ extern "C" { EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \ EVP_PKEY_CTRL_TLS_SEED, seedlen, (void *)seed) +/* 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_KDF_strings(void); + +/* Error codes for the KDF functions. */ + +/* Function codes. */ +# define KDF_F_PKEY_TLS1_PRF_CTRL_STR 100 +# define KDF_F_PKEY_TLS1_PRF_DERIVE 101 + +/* Reason codes. */ +# define KDF_R_INVALID_DIGEST 100 +# define KDF_R_MISSING_PARAMETER 101 +# define KDF_R_VALUE_MISSING 102 + #ifdef __cplusplus } #endif