diff options
author | jsing <> | 2014-04-15 13:42:55 +0000 |
---|---|---|
committer | jsing <> | 2014-04-15 13:42:55 +0000 |
commit | 179b5aba8054138fe6ae76eb86d0ba485fa99f67 (patch) | |
tree | f085d85cb06e6b6e1a1b1d52cced54d9f7d7e5f2 /src/lib/libcrypto/cpt_err.c | |
parent | 91b7379546c278344ff2e20e9eb6ecec326f20cd (diff) | |
download | openbsd-179b5aba8054138fe6ae76eb86d0ba485fa99f67.tar.gz openbsd-179b5aba8054138fe6ae76eb86d0ba485fa99f67.tar.bz2 openbsd-179b5aba8054138fe6ae76eb86d0ba485fa99f67.zip |
First pass at applying KNF to the OpenSSL code, which almost makes it
readable. This pass is whitespace only and can readily be verified using
tr and md5.
Diffstat (limited to 'src/lib/libcrypto/cpt_err.c')
-rw-r--r-- | src/lib/libcrypto/cpt_err.c | 55 |
1 files changed, 26 insertions, 29 deletions
diff --git a/src/lib/libcrypto/cpt_err.c b/src/lib/libcrypto/cpt_err.c index 289005f662..a8e94ccd16 100644 --- a/src/lib/libcrypto/cpt_err.c +++ b/src/lib/libcrypto/cpt_err.c | |||
@@ -68,38 +68,35 @@ | |||
68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CRYPTO,func,0) | 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CRYPTO,func,0) |
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CRYPTO,0,reason) | 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_CRYPTO,0,reason) |
70 | 70 | ||
71 | static ERR_STRING_DATA CRYPTO_str_functs[]= | 71 | static ERR_STRING_DATA CRYPTO_str_functs[]= { |
72 | { | 72 | {ERR_FUNC(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX), "CRYPTO_get_ex_new_index"}, |
73 | {ERR_FUNC(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX), "CRYPTO_get_ex_new_index"}, | 73 | {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID), "CRYPTO_get_new_dynlockid"}, |
74 | {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_DYNLOCKID), "CRYPTO_get_new_dynlockid"}, | 74 | {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_LOCKID), "CRYPTO_get_new_lockid"}, |
75 | {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_LOCKID), "CRYPTO_get_new_lockid"}, | 75 | {ERR_FUNC(CRYPTO_F_CRYPTO_SET_EX_DATA), "CRYPTO_set_ex_data"}, |
76 | {ERR_FUNC(CRYPTO_F_CRYPTO_SET_EX_DATA), "CRYPTO_set_ex_data"}, | 76 | {ERR_FUNC(CRYPTO_F_DEF_ADD_INDEX), "DEF_ADD_INDEX"}, |
77 | {ERR_FUNC(CRYPTO_F_DEF_ADD_INDEX), "DEF_ADD_INDEX"}, | 77 | {ERR_FUNC(CRYPTO_F_DEF_GET_CLASS), "DEF_GET_CLASS"}, |
78 | {ERR_FUNC(CRYPTO_F_DEF_GET_CLASS), "DEF_GET_CLASS"}, | 78 | {ERR_FUNC(CRYPTO_F_FIPS_MODE_SET), "FIPS_mode_set"}, |
79 | {ERR_FUNC(CRYPTO_F_FIPS_MODE_SET), "FIPS_mode_set"}, | 79 | {ERR_FUNC(CRYPTO_F_INT_DUP_EX_DATA), "INT_DUP_EX_DATA"}, |
80 | {ERR_FUNC(CRYPTO_F_INT_DUP_EX_DATA), "INT_DUP_EX_DATA"}, | 80 | {ERR_FUNC(CRYPTO_F_INT_FREE_EX_DATA), "INT_FREE_EX_DATA"}, |
81 | {ERR_FUNC(CRYPTO_F_INT_FREE_EX_DATA), "INT_FREE_EX_DATA"}, | 81 | {ERR_FUNC(CRYPTO_F_INT_NEW_EX_DATA), "INT_NEW_EX_DATA"}, |
82 | {ERR_FUNC(CRYPTO_F_INT_NEW_EX_DATA), "INT_NEW_EX_DATA"}, | 82 | {0, NULL} |
83 | {0,NULL} | 83 | }; |
84 | }; | ||
85 | 84 | ||
86 | static ERR_STRING_DATA CRYPTO_str_reasons[]= | 85 | static ERR_STRING_DATA CRYPTO_str_reasons[]= { |
87 | { | 86 | {ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"}, |
88 | {ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED),"fips mode not supported"}, | 87 | {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK), "no dynlock create callback"}, |
89 | {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK),"no dynlock create callback"}, | 88 | {0, NULL} |
90 | {0,NULL} | 89 | }; |
91 | }; | ||
92 | 90 | ||
93 | #endif | 91 | #endif |
94 | 92 | ||
95 | void ERR_load_CRYPTO_strings(void) | 93 | void |
96 | { | 94 | ERR_load_CRYPTO_strings(void) |
95 | { | ||
97 | #ifndef OPENSSL_NO_ERR | 96 | #ifndef OPENSSL_NO_ERR |
98 | 97 | if (ERR_func_error_string(CRYPTO_str_functs[0].error) == NULL) { | |
99 | if (ERR_func_error_string(CRYPTO_str_functs[0].error) == NULL) | 98 | ERR_load_strings(0, CRYPTO_str_functs); |
100 | { | 99 | ERR_load_strings(0, CRYPTO_str_reasons); |
101 | ERR_load_strings(0,CRYPTO_str_functs); | ||
102 | ERR_load_strings(0,CRYPTO_str_reasons); | ||
103 | } | ||
104 | #endif | ||
105 | } | 100 | } |
101 | #endif | ||
102 | } | ||