diff options
| author | beck <> | 2017-01-29 17:49:23 +0000 |
|---|---|---|
| committer | beck <> | 2017-01-29 17:49:23 +0000 |
| commit | d1f47bd292f36094480caa49ada36b99a69c59b0 (patch) | |
| tree | 1a54abba678898ee5270ae4f3404a50ee9a92eea /src/lib/libcrypto/dh/dh_err.c | |
| parent | f8c627888330b75c2eea8a3c27d0efe947a4f9da (diff) | |
| download | openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.gz openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.tar.bz2 openbsd-d1f47bd292f36094480caa49ada36b99a69c59b0.zip | |
Send the function codes from the error functions to the bit bucket,
as was done earlier in libssl. Thanks inoguchi@ for noticing
libssl had more reacharounds into this.
ok jsing@ inoguchi@
Diffstat (limited to 'src/lib/libcrypto/dh/dh_err.c')
| -rw-r--r-- | src/lib/libcrypto/dh/dh_err.c | 27 |
1 files changed, 5 insertions, 22 deletions
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 @@ | |||
| 1 | /* $OpenBSD: dh_err.c,v 1.15 2014/07/10 22:45:56 jsing Exp $ */ | 1 | /* $OpenBSD: dh_err.c,v 1.16 2017/01/29 17:49:22 beck Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -71,27 +71,10 @@ | |||
| 71 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0) | 71 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0) |
| 72 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason) | 72 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason) |
| 73 | 73 | ||
| 74 | static ERR_STRING_DATA DH_str_functs[]= | 74 | static ERR_STRING_DATA DH_str_functs[]= { |
| 75 | { | 75 | {ERR_FUNC(0xfff), "CRYPTO_internal"}, |
| 76 | {ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"}, | 76 | {0, NULL} |
| 77 | {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"}, | 77 | }; |
| 78 | {ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS), "DH_BUILTIN_GENPARAMS"}, | ||
| 79 | {ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"}, | ||
| 80 | {ERR_FUNC(DH_F_DH_GENERATE_KEY), "DH_generate_key"}, | ||
| 81 | {ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS_EX), "DH_generate_parameters_ex"}, | ||
| 82 | {ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"}, | ||
| 83 | {ERR_FUNC(DH_F_DH_PARAM_DECODE), "DH_PARAM_DECODE"}, | ||
| 84 | {ERR_FUNC(DH_F_DH_PRIV_DECODE), "DH_PRIV_DECODE"}, | ||
| 85 | {ERR_FUNC(DH_F_DH_PRIV_ENCODE), "DH_PRIV_ENCODE"}, | ||
| 86 | {ERR_FUNC(DH_F_DH_PUB_DECODE), "DH_PUB_DECODE"}, | ||
| 87 | {ERR_FUNC(DH_F_DH_PUB_ENCODE), "DH_PUB_ENCODE"}, | ||
| 88 | {ERR_FUNC(DH_F_DO_DH_PRINT), "DO_DH_PRINT"}, | ||
| 89 | {ERR_FUNC(DH_F_GENERATE_KEY), "GENERATE_KEY"}, | ||
| 90 | {ERR_FUNC(DH_F_GENERATE_PARAMETERS), "GENERATE_PARAMETERS"}, | ||
| 91 | {ERR_FUNC(DH_F_PKEY_DH_DERIVE), "PKEY_DH_DERIVE"}, | ||
| 92 | {ERR_FUNC(DH_F_PKEY_DH_KEYGEN), "PKEY_DH_KEYGEN"}, | ||
| 93 | {0,NULL} | ||
| 94 | }; | ||
| 95 | 78 | ||
| 96 | static ERR_STRING_DATA DH_str_reasons[]= | 79 | static ERR_STRING_DATA DH_str_reasons[]= |
| 97 | { | 80 | { |
