summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/err/err_all.c
diff options
context:
space:
mode:
authorjsing <>2014-04-21 14:50:59 +0000
committerjsing <>2014-04-21 14:50:59 +0000
commit4a1cabf252e81d8cf554c92fe0d6b88aa14cf747 (patch)
treec72a444a0794628ca063d111124d9785765f8db9 /src/lib/libcrypto/err/err_all.c
parentac499e34042be918cb0f1f53989f22ef20948783 (diff)
downloadopenbsd-4a1cabf252e81d8cf554c92fe0d6b88aa14cf747.tar.gz
openbsd-4a1cabf252e81d8cf554c92fe0d6b88aa14cf747.tar.bz2
openbsd-4a1cabf252e81d8cf554c92fe0d6b88aa14cf747.zip
KNF.
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/err/err_all.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c
index 1c4eccd251..1350c61296 100644
--- a/src/lib/libcrypto/err/err_all.c
+++ b/src/lib/libcrypto/err/err_all.c
@@ -5,21 +5,21 @@
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA, 11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms 13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 * 15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in 16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed. 17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution 18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used. 19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or 20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package. 21 * in documentation (online or textual) provided with the package.
22 * 22 *
23 * Redistribution and use in source and binary forms, with or without 23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions 24 * modification, are permitted provided that the following conditions
25 * are met: 25 * are met:
@@ -34,10 +34,10 @@
34 * Eric Young (eay@cryptsoft.com)" 34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library 35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-). 36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from 37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement: 38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 * 40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -49,7 +49,7 @@
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE. 51 * SUCH DAMAGE.
52 * 52 *
53 * The licence and distribution terms for any publically available version or 53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be 54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
@@ -105,8 +105,9 @@
105#include <openssl/jpake.h> 105#include <openssl/jpake.h>
106#endif 106#endif
107 107
108void ERR_load_crypto_strings(void) 108void
109 { 109ERR_load_crypto_strings(void)
110{
110#ifndef OPENSSL_NO_ERR 111#ifndef OPENSSL_NO_ERR
111 ERR_load_ERR_strings(); /* include error strings for SYSerr */ 112 ERR_load_ERR_strings(); /* include error strings for SYSerr */
112 ERR_load_BN_strings(); 113 ERR_load_BN_strings();
@@ -141,7 +142,7 @@ void ERR_load_crypto_strings(void)
141#endif 142#endif
142 /* skip ERR_load_SSL_strings() because it is not in this library */ 143 /* skip ERR_load_SSL_strings() because it is not in this library */
143 ERR_load_BIO_strings(); 144 ERR_load_BIO_strings();
144 ERR_load_PKCS7_strings(); 145 ERR_load_PKCS7_strings();
145 ERR_load_X509V3_strings(); 146 ERR_load_X509V3_strings();
146 ERR_load_PKCS12_strings(); 147 ERR_load_PKCS12_strings();
147 ERR_load_RAND_strings(); 148 ERR_load_RAND_strings();
@@ -159,4 +160,4 @@ void ERR_load_crypto_strings(void)
159 ERR_load_JPAKE_strings(); 160 ERR_load_JPAKE_strings();
160#endif 161#endif
161#endif 162#endif
162 } 163}