summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-04-20 14:32:19 +0000
committerjsing <>2014-04-20 14:32:19 +0000
commite30dbd6d979a7c2e99c8c4b4660b81e5c18b0c8c (patch)
treefab20b775c31a23956dbbb4a4fb4aa288ee27a94
parentf3c3afa642d281b9472832f33041f3dc51156597 (diff)
downloadopenbsd-e30dbd6d979a7c2e99c8c4b4660b81e5c18b0c8c.tar.gz
openbsd-e30dbd6d979a7c2e99c8c4b4660b81e5c18b0c8c.tar.bz2
openbsd-e30dbd6d979a7c2e99c8c4b4660b81e5c18b0c8c.zip
More KNF.
Diffstat
-rw-r--r--src/lib/libcrypto/cpt_err.c6
-rw-r--r--src/lib/libcrypto/cryptlib.h16
-rw-r--r--src/lib/libcrypto/crypto.h16
-rw-r--r--src/lib/libcrypto/cversion.c12
-rw-r--r--src/lib/libcrypto/ex_data.c55
-rw-r--r--src/lib/libcrypto/malloc-wrapper.c4
-rw-r--r--src/lib/libcrypto/md32_common.h4
-rw-r--r--src/lib/libcrypto/mem_dbg.c24
-rw-r--r--src/lib/libcrypto/o_time.c22
-rw-r--r--src/lib/libcrypto/o_time.h2
-rw-r--r--src/lib/libcrypto/ossl_typ.h2
-rw-r--r--src/lib/libcrypto/ppccap.c2
-rw-r--r--src/lib/libcrypto/sparcv9cap.c3
-rw-r--r--src/lib/libssl/src/crypto/cpt_err.c6
-rw-r--r--src/lib/libssl/src/crypto/cryptlib.h16
-rw-r--r--src/lib/libssl/src/crypto/crypto.h16
-rw-r--r--src/lib/libssl/src/crypto/cversion.c12
-rw-r--r--src/lib/libssl/src/crypto/ex_data.c55
-rw-r--r--src/lib/libssl/src/crypto/malloc-wrapper.c4
-rw-r--r--src/lib/libssl/src/crypto/md32_common.h4
-rw-r--r--src/lib/libssl/src/crypto/mem_dbg.c24
-rw-r--r--src/lib/libssl/src/crypto/o_time.c22
-rw-r--r--src/lib/libssl/src/crypto/o_time.h2
-rw-r--r--src/lib/libssl/src/crypto/ossl_typ.h2
-rw-r--r--src/lib/libssl/src/crypto/ppccap.c2
-rw-r--r--src/lib/libssl/src/crypto/sparcv9cap.c3
26 files changed, 176 insertions, 160 deletions
diff --git a/src/lib/libcrypto/cpt_err.c b/src/lib/libcrypto/cpt_err.c
index a8e94ccd16..5c1946c061 100644
--- a/src/lib/libcrypto/cpt_err.c
+++ b/src/lib/libcrypto/cpt_err.c
@@ -7,7 +7,7 @@
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
@@ -68,7 +68,7 @@
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
71static ERR_STRING_DATA CRYPTO_str_functs[]= { 71static ERR_STRING_DATA CRYPTO_str_functs[] = {
72 {ERR_FUNC(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX), "CRYPTO_get_ex_new_index"}, 72 {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"}, 73 {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"}, 74 {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_LOCKID), "CRYPTO_get_new_lockid"},
@@ -82,7 +82,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[]= {
82 {0, NULL} 82 {0, NULL}
83}; 83};
84 84
85static ERR_STRING_DATA CRYPTO_str_reasons[]= { 85static ERR_STRING_DATA CRYPTO_str_reasons[] = {
86 {ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"}, 86 {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"}, 87 {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK), "no dynlock create callback"},
88 {0, NULL} 88 {0, NULL}
diff --git a/src/lib/libcrypto/cryptlib.h b/src/lib/libcrypto/cryptlib.h
index a785024159..f43aa30b41 100644
--- a/src/lib/libcrypto/cryptlib.h
+++ b/src/lib/libcrypto/cryptlib.h
@@ -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
@@ -65,8 +65,8 @@
65#include <unistd.h> 65#include <unistd.h>
66 66
67#include <openssl/crypto.h> 67#include <openssl/crypto.h>
68#include <openssl/buffer.h> 68#include <openssl/buffer.h>
69#include <openssl/bio.h> 69#include <openssl/bio.h>
70#include <openssl/err.h> 70#include <openssl/err.h>
71#include <openssl/opensslconf.h> 71#include <openssl/opensslconf.h>
72 72
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 0b7634cd9e..11c34d8bbe 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -7,7 +7,7 @@
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
@@ -58,21 +58,21 @@
58 * This package is an SSL implementation written 58 * This package is an SSL implementation written
59 * by Eric Young (eay@cryptsoft.com). 59 * by Eric Young (eay@cryptsoft.com).
60 * The implementation was written so as to conform with Netscapes SSL. 60 * The implementation was written so as to conform with Netscapes SSL.
61 * 61 *
62 * This library is free for commercial and non-commercial use as long as 62 * This library is free for commercial and non-commercial use as long as
63 * the following conditions are aheared to. The following conditions 63 * the following conditions are aheared to. The following conditions
64 * apply to all code found in this distribution, be it the RC4, RSA, 64 * apply to all code found in this distribution, be it the RC4, RSA,
65 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 65 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
66 * included with this distribution is covered by the same copyright terms 66 * included with this distribution is covered by the same copyright terms
67 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 67 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
68 * 68 *
69 * Copyright remains Eric Young's, and as such any Copyright notices in 69 * Copyright remains Eric Young's, and as such any Copyright notices in
70 * the code are not to be removed. 70 * the code are not to be removed.
71 * If this package is used in a product, Eric Young should be given attribution 71 * If this package is used in a product, Eric Young should be given attribution
72 * as the author of the parts of the library used. 72 * as the author of the parts of the library used.
73 * This can be in the form of a textual message at program startup or 73 * This can be in the form of a textual message at program startup or
74 * in documentation (online or textual) provided with the package. 74 * in documentation (online or textual) provided with the package.
75 * 75 *
76 * Redistribution and use in source and binary forms, with or without 76 * Redistribution and use in source and binary forms, with or without
77 * modification, are permitted provided that the following conditions 77 * modification, are permitted provided that the following conditions
78 * are met: 78 * are met:
@@ -87,10 +87,10 @@
87 * Eric Young (eay@cryptsoft.com)" 87 * Eric Young (eay@cryptsoft.com)"
88 * The word 'cryptographic' can be left out if the rouines from the library 88 * The word 'cryptographic' can be left out if the rouines from the library
89 * being used are not cryptographic related :-). 89 * being used are not cryptographic related :-).
90 * 4. If you include any Windows specific code (or a derivative thereof) from 90 * 4. If you include any Windows specific code (or a derivative thereof) from
91 * the apps directory (application code) you must include an acknowledgement: 91 * the apps directory (application code) you must include an acknowledgement:
92 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 92 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
93 * 93 *
94 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 94 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
95 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 95 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
96 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 96 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -102,7 +102,7 @@
102 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 102 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
103 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 103 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
104 * SUCH DAMAGE. 104 * SUCH DAMAGE.
105 * 105 *
106 * The licence and distribution terms for any publically available version or 106 * The licence and distribution terms for any publically available version or
107 * derivative of this code cannot be changed. i.e. this code cannot simply be 107 * derivative of this code cannot be changed. i.e. this code cannot simply be
108 * copied and put under another distribution licence 108 * copied and put under another distribution licence
@@ -110,7 +110,7 @@
110 */ 110 */
111/* ==================================================================== 111/* ====================================================================
112 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 112 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
113 * ECDH support in OpenSSL originally developed by 113 * ECDH support in OpenSSL originally developed by
114 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. 114 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
115 */ 115 */
116 116
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
index 326216d084..38999ab670 100644
--- a/src/lib/libcrypto/cversion.c
+++ b/src/lib/libcrypto/cversion.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
diff --git a/src/lib/libcrypto/ex_data.c b/src/lib/libcrypto/ex_data.c
index 0b27d57b45..77a91c4b04 100644
--- a/src/lib/libcrypto/ex_data.c
+++ b/src/lib/libcrypto/ex_data.c
@@ -34,21 +34,21 @@
34 * This package is an SSL implementation written 34 * This package is an SSL implementation written
35 * by Eric Young (eay@cryptsoft.com). 35 * by Eric Young (eay@cryptsoft.com).
36 * The implementation was written so as to conform with Netscapes SSL. 36 * The implementation was written so as to conform with Netscapes SSL.
37 * 37 *
38 * This library is free for commercial and non-commercial use as long as 38 * This library is free for commercial and non-commercial use as long as
39 * the following conditions are aheared to. The following conditions 39 * the following conditions are aheared to. The following conditions
40 * apply to all code found in this distribution, be it the RC4, RSA, 40 * apply to all code found in this distribution, be it the RC4, RSA,
41 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 41 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
42 * included with this distribution is covered by the same copyright terms 42 * included with this distribution is covered by the same copyright terms
43 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 43 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
44 * 44 *
45 * Copyright remains Eric Young's, and as such any Copyright notices in 45 * Copyright remains Eric Young's, and as such any Copyright notices in
46 * the code are not to be removed. 46 * the code are not to be removed.
47 * If this package is used in a product, Eric Young should be given attribution 47 * If this package is used in a product, Eric Young should be given attribution
48 * as the author of the parts of the library used. 48 * as the author of the parts of the library used.
49 * This can be in the form of a textual message at program startup or 49 * This can be in the form of a textual message at program startup or
50 * in documentation (online or textual) provided with the package. 50 * in documentation (online or textual) provided with the package.
51 * 51 *
52 * Redistribution and use in source and binary forms, with or without 52 * Redistribution and use in source and binary forms, with or without
53 * modification, are permitted provided that the following conditions 53 * modification, are permitted provided that the following conditions
54 * are met: 54 * are met:
@@ -63,10 +63,10 @@
63 * Eric Young (eay@cryptsoft.com)" 63 * Eric Young (eay@cryptsoft.com)"
64 * The word 'cryptographic' can be left out if the rouines from the library 64 * The word 'cryptographic' can be left out if the rouines from the library
65 * being used are not cryptographic related :-). 65 * being used are not cryptographic related :-).
66 * 4. If you include any Windows specific code (or a derivative thereof) from 66 * 4. If you include any Windows specific code (or a derivative thereof) from
67 * the apps directory (application code) you must include an acknowledgement: 67 * the apps directory (application code) you must include an acknowledgement:
68 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 68 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
69 * 69 *
70 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 70 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
71 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 71 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
72 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 72 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -78,7 +78,7 @@
78 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 78 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
79 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 79 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
80 * SUCH DAMAGE. 80 * SUCH DAMAGE.
81 * 81 *
82 * The licence and distribution terms for any publically available version or 82 * The licence and distribution terms for any publically available version or
83 * derivative of this code cannot be changed. i.e. this code cannot simply be 83 * derivative of this code cannot be changed. i.e. this code cannot simply be
84 * copied and put under another distribution licence 84 * copied and put under another distribution licence
@@ -92,7 +92,7 @@
92 * are met: 92 * are met:
93 * 93 *
94 * 1. Redistributions of source code must retain the above copyright 94 * 1. Redistributions of source code must retain the above copyright
95 * notice, this list of conditions and the following disclaimer. 95 * notice, this list of conditions and the following disclaimer.
96 * 96 *
97 * 2. Redistributions in binary form must reproduce the above copyright 97 * 2. Redistributions in binary form must reproduce the above copyright
98 * notice, this list of conditions and the following disclaimer in 98 * notice, this list of conditions and the following disclaimer in
@@ -276,9 +276,9 @@ ex_data_check(void)
276{ 276{
277 int toret = 1; 277 int toret = 1;
278 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA); 278 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
279 if (!ex_data 279 if (!ex_data &&
280 && (ex_data = lh_EX_CLASS_ITEM_new()) == NULL) 280 (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
281 toret = 0; 281 toret = 0;
282 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); 282 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
283 return toret; 283 return toret;
284} 284}
@@ -344,7 +344,7 @@ def_add_index(EX_CLASS_ITEM *item, long argl, void *argp,
344{ 344{
345 int toret = -1; 345 int toret = -1;
346 CRYPTO_EX_DATA_FUNCS *a = (CRYPTO_EX_DATA_FUNCS *)malloc( 346 CRYPTO_EX_DATA_FUNCS *a = (CRYPTO_EX_DATA_FUNCS *)malloc(
347 sizeof(CRYPTO_EX_DATA_FUNCS)); 347 sizeof(CRYPTO_EX_DATA_FUNCS));
348 if (!a) { 348 if (!a) {
349 CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE); 349 CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE);
350 return -1; 350 return -1;
@@ -376,6 +376,7 @@ static int
376int_new_class(void) 376int_new_class(void)
377{ 377{
378 int toret; 378 int toret;
379
379 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA); 380 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
380 toret = ex_class++; 381 toret = ex_class++;
381 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); 382 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
@@ -395,9 +396,10 @@ int_cleanup(void)
395static int 396static int
396int_get_new_index(int class_index, long argl, void *argp, 397int_get_new_index(int class_index, long argl, void *argp,
397 CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, 398 CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
398CRYPTO_EX_free *free_func) 399 CRYPTO_EX_free *free_func)
399{ 400{
400 EX_CLASS_ITEM *item = def_get_class(class_index); 401 EX_CLASS_ITEM *item = def_get_class(class_index);
402
401 if (!item) 403 if (!item)
402 return -1; 404 return -1;
403 return def_add_index(item, argl, argp, new_func, dup_func, free_func); 405 return def_add_index(item, argl, argp, new_func, dup_func, free_func);
@@ -408,13 +410,13 @@ CRYPTO_EX_free *free_func)
408 * the global "ex_data" state (ie. class definitions), not thread-safe on 'ad' 410 * the global "ex_data" state (ie. class definitions), not thread-safe on 'ad'
409 * itself. */ 411 * itself. */
410static int 412static int
411int_new_ex_data(int class_index, void *obj, 413int_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
412 CRYPTO_EX_DATA *ad)
413{ 414{
414 int mx, i; 415 int mx, i;
415 void *ptr; 416 void *ptr;
416 CRYPTO_EX_DATA_FUNCS **storage = NULL; 417 CRYPTO_EX_DATA_FUNCS **storage = NULL;
417 EX_CLASS_ITEM *item = def_get_class(class_index); 418 EX_CLASS_ITEM *item = def_get_class(class_index);
419
418 if (!item) 420 if (!item)
419 /* error is already set */ 421 /* error is already set */
420 return 0; 422 return 0;
@@ -426,7 +428,8 @@ int_new_ex_data(int class_index, void *obj,
426 if (!storage) 428 if (!storage)
427 goto skip; 429 goto skip;
428 for (i = 0; i < mx; i++) 430 for (i = 0; i < mx; i++)
429 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i); 431 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
432 item->meth, i);
430 } 433 }
431skip: 434skip:
432 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA); 435 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -438,7 +441,7 @@ skip:
438 if (storage[i] && storage[i]->new_func) { 441 if (storage[i] && storage[i]->new_func) {
439 ptr = CRYPTO_get_ex_data(ad, i); 442 ptr = CRYPTO_get_ex_data(ad, i);
440 storage[i]->new_func(obj, ptr, ad, i, 443 storage[i]->new_func(obj, ptr, ad, i,
441 storage[i]->argl, storage[i]->argp); 444 storage[i]->argl, storage[i]->argp);
442 } 445 }
443 } 446 }
444 if (storage) 447 if (storage)
@@ -448,13 +451,13 @@ skip:
448 451
449/* Same thread-safety notes as for "int_new_ex_data" */ 452/* Same thread-safety notes as for "int_new_ex_data" */
450static int 453static int
451int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, 454int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from)
452 CRYPTO_EX_DATA *from)
453{ 455{
454 int mx, j, i; 456 int mx, j, i;
455 char *ptr; 457 char *ptr;
456 CRYPTO_EX_DATA_FUNCS **storage = NULL; 458 CRYPTO_EX_DATA_FUNCS **storage = NULL;
457 EX_CLASS_ITEM *item; 459 EX_CLASS_ITEM *item;
460
458 if (!from->sk) 461 if (!from->sk)
459 /* 'to' should be "blank" which *is* just like 'from' */ 462 /* 'to' should be "blank" which *is* just like 'from' */
460 return 1; 463 return 1;
@@ -470,7 +473,8 @@ int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
470 if (!storage) 473 if (!storage)
471 goto skip; 474 goto skip;
472 for (i = 0; i < mx; i++) 475 for (i = 0; i < mx; i++)
473 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i); 476 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
477 item->meth, i);
474 } 478 }
475skip: 479skip:
476 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA); 480 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -507,7 +511,8 @@ int_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
507 if (!storage) 511 if (!storage)
508 goto skip; 512 goto skip;
509 for (i = 0; i < mx; i++) 513 for (i = 0; i < mx; i++)
510 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i); 514 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
515 item->meth, i);
511 } 516 }
512skip: 517skip:
513 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA); 518 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -519,7 +524,7 @@ skip:
519 if (storage[i] && storage[i]->free_func) { 524 if (storage[i] && storage[i]->free_func) {
520 ptr = CRYPTO_get_ex_data(ad, i); 525 ptr = CRYPTO_get_ex_data(ad, i);
521 storage[i]->free_func(obj, ptr, ad, i, 526 storage[i]->free_func(obj, ptr, ad, i,
522 storage[i]->argl, storage[i]->argp); 527 storage[i]->argl, storage[i]->argp);
523 } 528 }
524 } 529 }
525 if (storage) 530 if (storage)
@@ -563,7 +568,7 @@ CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
563 568
564 IMPL_CHECK 569 IMPL_CHECK
565 ret = EX_IMPL(get_new_index)(class_index, 570 ret = EX_IMPL(get_new_index)(class_index,
566 argl, argp, new_func, dup_func, free_func); 571 argl, argp, new_func, dup_func, free_func);
567 return ret; 572 return ret;
568} 573}
569 574
@@ -603,7 +608,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
603 608
604 if (ad->sk == NULL) { 609 if (ad->sk == NULL) {
605 if ((ad->sk = sk_void_new_null()) == NULL) { 610 if ((ad->sk = sk_void_new_null()) == NULL) {
606 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE); 611 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
612 ERR_R_MALLOC_FAILURE);
607 return (0); 613 return (0);
608 } 614 }
609 } 615 }
@@ -611,7 +617,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
611 617
612 while (i <= idx) { 618 while (i <= idx) {
613 if (!sk_void_push(ad->sk, NULL)) { 619 if (!sk_void_push(ad->sk, NULL)) {
614 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE); 620 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
621 ERR_R_MALLOC_FAILURE);
615 return (0); 622 return (0);
616 } 623 }
617 i++; 624 i++;
diff --git a/src/lib/libcrypto/malloc-wrapper.c b/src/lib/libcrypto/malloc-wrapper.c
index c754df40e3..68af818230 100644
--- a/src/lib/libcrypto/malloc-wrapper.c
+++ b/src/lib/libcrypto/malloc-wrapper.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc-wrapper.c,v 1.2 2014/04/17 20:44:45 tedu Exp $ */ 1/* $OpenBSD: malloc-wrapper.c,v 1.3 2014/04/20 14:32:19 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Bob Beck 3 * Copyright (c) 2014 Bob Beck
4 * 4 *
@@ -154,7 +154,7 @@ CRYPTO_realloc(void *ptr, int num, const char *file, int line)
154 154
155void * 155void *
156CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file, 156CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file,
157int line) 157 int line)
158{ 158{
159 void *ret = NULL; 159 void *ret = NULL;
160 160
diff --git a/src/lib/libcrypto/md32_common.h b/src/lib/libcrypto/md32_common.h
index 3e02776d30..be097bfc70 100644
--- a/src/lib/libcrypto/md32_common.h
+++ b/src/lib/libcrypto/md32_common.h
@@ -7,7 +7,7 @@
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
@@ -377,7 +377,7 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
377 * *either* case. Now declaring 'em long excuses the compiler 377 * *either* case. Now declaring 'em long excuses the compiler
378 * from keeping 32 MSBs zeroed resulting in 13% performance 378 * from keeping 32 MSBs zeroed resulting in 13% performance
379 * improvement under SPARC Solaris7/64 and 5% under AlphaLinux. 379 * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
380 * Well, to be honest it should say that this *prevents* 380 * Well, to be honest it should say that this *prevents*
381 * performance degradation. 381 * performance degradation.
382 * <appro@fy.chalmers.se> 382 * <appro@fy.chalmers.se>
383 */ 383 */
diff --git a/src/lib/libcrypto/mem_dbg.c b/src/lib/libcrypto/mem_dbg.c
index fad6a58496..3b51be61f7 100644
--- a/src/lib/libcrypto/mem_dbg.c
+++ b/src/lib/libcrypto/mem_dbg.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
@@ -63,7 +63,7 @@
63 * are met: 63 * are met:
64 * 64 *
65 * 1. Redistributions of source code must retain the above copyright 65 * 1. Redistributions of source code must retain the above copyright
66 * notice, this list of conditions and the following disclaimer. 66 * notice, this list of conditions and the following disclaimer.
67 * 67 *
68 * 2. Redistributions in binary form must reproduce the above copyright 68 * 2. Redistributions in binary form must reproduce the above copyright
69 * notice, this list of conditions and the following disclaimer in 69 * notice, this list of conditions and the following disclaimer in
@@ -127,7 +127,7 @@ CRYPTO_mem_ctrl(int mode)
127int 127int
128CRYPTO_is_mem_check_on(void) 128CRYPTO_is_mem_check_on(void)
129{ 129{
130 return(0); 130 return (0);
131} 131}
132 132
133 133
@@ -140,25 +140,25 @@ CRYPTO_dbg_set_options(long bits)
140long 140long
141CRYPTO_dbg_get_options(void) 141CRYPTO_dbg_get_options(void)
142{ 142{
143 return(0); 143 return (0);
144} 144}
145 145
146int 146int
147CRYPTO_push_info_(const char *info, const char *file, int line) 147CRYPTO_push_info_(const char *info, const char *file, int line)
148{ 148{
149 return(0); 149 return (0);
150} 150}
151 151
152int 152int
153CRYPTO_pop_info(void) 153CRYPTO_pop_info(void)
154{ 154{
155 return(0); 155 return (0);
156} 156}
157 157
158int 158int
159CRYPTO_remove_all_info(void) 159CRYPTO_remove_all_info(void)
160{ 160{
161 return(0); 161 return (0);
162} 162}
163 163
164void 164void
diff --git a/src/lib/libcrypto/o_time.c b/src/lib/libcrypto/o_time.c
index 000372d35b..287aaae7ab 100644
--- a/src/lib/libcrypto/o_time.c
+++ b/src/lib/libcrypto/o_time.c
@@ -13,7 +13,7 @@
13 * are met: 13 * are met:
14 * 14 *
15 * 1. Redistributions of source code must retain the above copyright 15 * 1. Redistributions of source code must retain the above copyright
16 * notice, this list of conditions and the following disclaimer. 16 * notice, this list of conditions and the following disclaimer.
17 * 17 *
18 * 2. Redistributions in binary form must reproduce the above copyright 18 * 2. Redistributions in binary form must reproduce the above copyright
19 * notice, this list of conditions and the following disclaimer in 19 * notice, this list of conditions and the following disclaimer in
@@ -192,19 +192,19 @@ check_time(long offset)
192 gmtime_r(&t1, &tm1); 192 gmtime_r(&t1, &tm1);
193 OPENSSL_gmtime_adj(&tm1, 0, offset); 193 OPENSSL_gmtime_adj(&tm1, 0, offset);
194 if ((tm1.tm_year == tm2.tm_year) && 194 if ((tm1.tm_year == tm2.tm_year) &&
195 (tm1.tm_mon == tm2.tm_mon) && 195 (tm1.tm_mon == tm2.tm_mon) &&
196 (tm1.tm_mday == tm2.tm_mday) && 196 (tm1.tm_mday == tm2.tm_mday) &&
197 (tm1.tm_hour == tm2.tm_hour) && 197 (tm1.tm_hour == tm2.tm_hour) &&
198 (tm1.tm_min == tm2.tm_min) && 198 (tm1.tm_min == tm2.tm_min) &&
199 (tm1.tm_sec == tm2.tm_sec)) 199 (tm1.tm_sec == tm2.tm_sec))
200 return 1; 200 return 1;
201 fprintf(stderr, "TIME ERROR!!\n"); 201 fprintf(stderr, "TIME ERROR!!\n");
202 fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n", 202 fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n",
203 tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900, 203 tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
204 tm2.tm_hour, tm2.tm_min, tm2.tm_sec); 204 tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
205 fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n", 205 fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n",
206 tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900, 206 tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
207 tm1.tm_hour, tm1.tm_min, tm1.tm_sec); 207 tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
208 return 0; 208 return 0;
209} 209}
210 210
diff --git a/src/lib/libcrypto/o_time.h b/src/lib/libcrypto/o_time.h
index 4f8288f5d5..086f5d6e71 100644
--- a/src/lib/libcrypto/o_time.h
+++ b/src/lib/libcrypto/o_time.h
@@ -10,7 +10,7 @@
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in 16 * notice, this list of conditions and the following disclaimer in
diff --git a/src/lib/libcrypto/ossl_typ.h b/src/lib/libcrypto/ossl_typ.h
index 3c360b0d9b..3a7a66edef 100644
--- a/src/lib/libcrypto/ossl_typ.h
+++ b/src/lib/libcrypto/ossl_typ.h
@@ -6,7 +6,7 @@
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in 12 * notice, this list of conditions and the following disclaimer in
diff --git a/src/lib/libcrypto/ppccap.c b/src/lib/libcrypto/ppccap.c
index 16cc9c445e..4d7dd38dd1 100644
--- a/src/lib/libcrypto/ppccap.c
+++ b/src/lib/libcrypto/ppccap.c
@@ -90,7 +90,7 @@ OPENSSL_cpuid_setup(void)
90#if defined(_AIX) 90#if defined(_AIX)
91 if (sizeof(size_t) == 4 91 if (sizeof(size_t) == 4
92# if defined(_SC_AIX_KERNEL_BITMODE) 92# if defined(_SC_AIX_KERNEL_BITMODE)
93 && sysconf(_SC_AIX_KERNEL_BITMODE) != 64 93 && sysconf(_SC_AIX_KERNEL_BITMODE) != 64
94# endif 94# endif
95 ) 95 )
96 return; 96 return;
diff --git a/src/lib/libcrypto/sparcv9cap.c b/src/lib/libcrypto/sparcv9cap.c
index f49e71ec93..36aacb0e00 100644
--- a/src/lib/libcrypto/sparcv9cap.c
+++ b/src/lib/libcrypto/sparcv9cap.c
@@ -34,7 +34,8 @@ void _sparcv9_vis2_probe(void);
34void _sparcv9_fmadd_probe(void); 34void _sparcv9_fmadd_probe(void);
35 35
36static sigjmp_buf common_jmp; 36static sigjmp_buf common_jmp;
37static void common_handler(int sig) 37static void
38common_handler(int sig)
38{ 39{
39 siglongjmp(common_jmp, sig); 40 siglongjmp(common_jmp, sig);
40} 41}
diff --git a/src/lib/libssl/src/crypto/cpt_err.c b/src/lib/libssl/src/crypto/cpt_err.c
index a8e94ccd16..5c1946c061 100644
--- a/src/lib/libssl/src/crypto/cpt_err.c
+++ b/src/lib/libssl/src/crypto/cpt_err.c
@@ -7,7 +7,7 @@
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
@@ -68,7 +68,7 @@
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
71static ERR_STRING_DATA CRYPTO_str_functs[]= { 71static ERR_STRING_DATA CRYPTO_str_functs[] = {
72 {ERR_FUNC(CRYPTO_F_CRYPTO_GET_EX_NEW_INDEX), "CRYPTO_get_ex_new_index"}, 72 {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"}, 73 {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"}, 74 {ERR_FUNC(CRYPTO_F_CRYPTO_GET_NEW_LOCKID), "CRYPTO_get_new_lockid"},
@@ -82,7 +82,7 @@ static ERR_STRING_DATA CRYPTO_str_functs[]= {
82 {0, NULL} 82 {0, NULL}
83}; 83};
84 84
85static ERR_STRING_DATA CRYPTO_str_reasons[]= { 85static ERR_STRING_DATA CRYPTO_str_reasons[] = {
86 {ERR_REASON(CRYPTO_R_FIPS_MODE_NOT_SUPPORTED), "fips mode not supported"}, 86 {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"}, 87 {ERR_REASON(CRYPTO_R_NO_DYNLOCK_CREATE_CALLBACK), "no dynlock create callback"},
88 {0, NULL} 88 {0, NULL}
diff --git a/src/lib/libssl/src/crypto/cryptlib.h b/src/lib/libssl/src/crypto/cryptlib.h
index a785024159..f43aa30b41 100644
--- a/src/lib/libssl/src/crypto/cryptlib.h
+++ b/src/lib/libssl/src/crypto/cryptlib.h
@@ -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
@@ -65,8 +65,8 @@
65#include <unistd.h> 65#include <unistd.h>
66 66
67#include <openssl/crypto.h> 67#include <openssl/crypto.h>
68#include <openssl/buffer.h> 68#include <openssl/buffer.h>
69#include <openssl/bio.h> 69#include <openssl/bio.h>
70#include <openssl/err.h> 70#include <openssl/err.h>
71#include <openssl/opensslconf.h> 71#include <openssl/opensslconf.h>
72 72
diff --git a/src/lib/libssl/src/crypto/crypto.h b/src/lib/libssl/src/crypto/crypto.h
index 0b7634cd9e..11c34d8bbe 100644
--- a/src/lib/libssl/src/crypto/crypto.h
+++ b/src/lib/libssl/src/crypto/crypto.h
@@ -7,7 +7,7 @@
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
@@ -58,21 +58,21 @@
58 * This package is an SSL implementation written 58 * This package is an SSL implementation written
59 * by Eric Young (eay@cryptsoft.com). 59 * by Eric Young (eay@cryptsoft.com).
60 * The implementation was written so as to conform with Netscapes SSL. 60 * The implementation was written so as to conform with Netscapes SSL.
61 * 61 *
62 * This library is free for commercial and non-commercial use as long as 62 * This library is free for commercial and non-commercial use as long as
63 * the following conditions are aheared to. The following conditions 63 * the following conditions are aheared to. The following conditions
64 * apply to all code found in this distribution, be it the RC4, RSA, 64 * apply to all code found in this distribution, be it the RC4, RSA,
65 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 65 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
66 * included with this distribution is covered by the same copyright terms 66 * included with this distribution is covered by the same copyright terms
67 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 67 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
68 * 68 *
69 * Copyright remains Eric Young's, and as such any Copyright notices in 69 * Copyright remains Eric Young's, and as such any Copyright notices in
70 * the code are not to be removed. 70 * the code are not to be removed.
71 * If this package is used in a product, Eric Young should be given attribution 71 * If this package is used in a product, Eric Young should be given attribution
72 * as the author of the parts of the library used. 72 * as the author of the parts of the library used.
73 * This can be in the form of a textual message at program startup or 73 * This can be in the form of a textual message at program startup or
74 * in documentation (online or textual) provided with the package. 74 * in documentation (online or textual) provided with the package.
75 * 75 *
76 * Redistribution and use in source and binary forms, with or without 76 * Redistribution and use in source and binary forms, with or without
77 * modification, are permitted provided that the following conditions 77 * modification, are permitted provided that the following conditions
78 * are met: 78 * are met:
@@ -87,10 +87,10 @@
87 * Eric Young (eay@cryptsoft.com)" 87 * Eric Young (eay@cryptsoft.com)"
88 * The word 'cryptographic' can be left out if the rouines from the library 88 * The word 'cryptographic' can be left out if the rouines from the library
89 * being used are not cryptographic related :-). 89 * being used are not cryptographic related :-).
90 * 4. If you include any Windows specific code (or a derivative thereof) from 90 * 4. If you include any Windows specific code (or a derivative thereof) from
91 * the apps directory (application code) you must include an acknowledgement: 91 * the apps directory (application code) you must include an acknowledgement:
92 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 92 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
93 * 93 *
94 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 94 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
95 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 95 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
96 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 96 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -102,7 +102,7 @@
102 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 102 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
103 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 103 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
104 * SUCH DAMAGE. 104 * SUCH DAMAGE.
105 * 105 *
106 * The licence and distribution terms for any publically available version or 106 * The licence and distribution terms for any publically available version or
107 * derivative of this code cannot be changed. i.e. this code cannot simply be 107 * derivative of this code cannot be changed. i.e. this code cannot simply be
108 * copied and put under another distribution licence 108 * copied and put under another distribution licence
@@ -110,7 +110,7 @@
110 */ 110 */
111/* ==================================================================== 111/* ====================================================================
112 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. 112 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
113 * ECDH support in OpenSSL originally developed by 113 * ECDH support in OpenSSL originally developed by
114 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project. 114 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
115 */ 115 */
116 116
diff --git a/src/lib/libssl/src/crypto/cversion.c b/src/lib/libssl/src/crypto/cversion.c
index 326216d084..38999ab670 100644
--- a/src/lib/libssl/src/crypto/cversion.c
+++ b/src/lib/libssl/src/crypto/cversion.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
diff --git a/src/lib/libssl/src/crypto/ex_data.c b/src/lib/libssl/src/crypto/ex_data.c
index 0b27d57b45..77a91c4b04 100644
--- a/src/lib/libssl/src/crypto/ex_data.c
+++ b/src/lib/libssl/src/crypto/ex_data.c
@@ -34,21 +34,21 @@
34 * This package is an SSL implementation written 34 * This package is an SSL implementation written
35 * by Eric Young (eay@cryptsoft.com). 35 * by Eric Young (eay@cryptsoft.com).
36 * The implementation was written so as to conform with Netscapes SSL. 36 * The implementation was written so as to conform with Netscapes SSL.
37 * 37 *
38 * This library is free for commercial and non-commercial use as long as 38 * This library is free for commercial and non-commercial use as long as
39 * the following conditions are aheared to. The following conditions 39 * the following conditions are aheared to. The following conditions
40 * apply to all code found in this distribution, be it the RC4, RSA, 40 * apply to all code found in this distribution, be it the RC4, RSA,
41 * lhash, DES, etc., code; not just the SSL code. The SSL documentation 41 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
42 * included with this distribution is covered by the same copyright terms 42 * included with this distribution is covered by the same copyright terms
43 * except that the holder is Tim Hudson (tjh@cryptsoft.com). 43 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
44 * 44 *
45 * Copyright remains Eric Young's, and as such any Copyright notices in 45 * Copyright remains Eric Young's, and as such any Copyright notices in
46 * the code are not to be removed. 46 * the code are not to be removed.
47 * If this package is used in a product, Eric Young should be given attribution 47 * If this package is used in a product, Eric Young should be given attribution
48 * as the author of the parts of the library used. 48 * as the author of the parts of the library used.
49 * This can be in the form of a textual message at program startup or 49 * This can be in the form of a textual message at program startup or
50 * in documentation (online or textual) provided with the package. 50 * in documentation (online or textual) provided with the package.
51 * 51 *
52 * Redistribution and use in source and binary forms, with or without 52 * Redistribution and use in source and binary forms, with or without
53 * modification, are permitted provided that the following conditions 53 * modification, are permitted provided that the following conditions
54 * are met: 54 * are met:
@@ -63,10 +63,10 @@
63 * Eric Young (eay@cryptsoft.com)" 63 * Eric Young (eay@cryptsoft.com)"
64 * The word 'cryptographic' can be left out if the rouines from the library 64 * The word 'cryptographic' can be left out if the rouines from the library
65 * being used are not cryptographic related :-). 65 * being used are not cryptographic related :-).
66 * 4. If you include any Windows specific code (or a derivative thereof) from 66 * 4. If you include any Windows specific code (or a derivative thereof) from
67 * the apps directory (application code) you must include an acknowledgement: 67 * the apps directory (application code) you must include an acknowledgement:
68 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" 68 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
69 * 69 *
70 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND 70 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
71 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 71 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
72 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 72 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -78,7 +78,7 @@
78 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 78 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
79 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 79 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
80 * SUCH DAMAGE. 80 * SUCH DAMAGE.
81 * 81 *
82 * The licence and distribution terms for any publically available version or 82 * The licence and distribution terms for any publically available version or
83 * derivative of this code cannot be changed. i.e. this code cannot simply be 83 * derivative of this code cannot be changed. i.e. this code cannot simply be
84 * copied and put under another distribution licence 84 * copied and put under another distribution licence
@@ -92,7 +92,7 @@
92 * are met: 92 * are met:
93 * 93 *
94 * 1. Redistributions of source code must retain the above copyright 94 * 1. Redistributions of source code must retain the above copyright
95 * notice, this list of conditions and the following disclaimer. 95 * notice, this list of conditions and the following disclaimer.
96 * 96 *
97 * 2. Redistributions in binary form must reproduce the above copyright 97 * 2. Redistributions in binary form must reproduce the above copyright
98 * notice, this list of conditions and the following disclaimer in 98 * notice, this list of conditions and the following disclaimer in
@@ -276,9 +276,9 @@ ex_data_check(void)
276{ 276{
277 int toret = 1; 277 int toret = 1;
278 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA); 278 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
279 if (!ex_data 279 if (!ex_data &&
280 && (ex_data = lh_EX_CLASS_ITEM_new()) == NULL) 280 (ex_data = lh_EX_CLASS_ITEM_new()) == NULL)
281 toret = 0; 281 toret = 0;
282 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); 282 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
283 return toret; 283 return toret;
284} 284}
@@ -344,7 +344,7 @@ def_add_index(EX_CLASS_ITEM *item, long argl, void *argp,
344{ 344{
345 int toret = -1; 345 int toret = -1;
346 CRYPTO_EX_DATA_FUNCS *a = (CRYPTO_EX_DATA_FUNCS *)malloc( 346 CRYPTO_EX_DATA_FUNCS *a = (CRYPTO_EX_DATA_FUNCS *)malloc(
347 sizeof(CRYPTO_EX_DATA_FUNCS)); 347 sizeof(CRYPTO_EX_DATA_FUNCS));
348 if (!a) { 348 if (!a) {
349 CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE); 349 CRYPTOerr(CRYPTO_F_DEF_ADD_INDEX, ERR_R_MALLOC_FAILURE);
350 return -1; 350 return -1;
@@ -376,6 +376,7 @@ static int
376int_new_class(void) 376int_new_class(void)
377{ 377{
378 int toret; 378 int toret;
379
379 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA); 380 CRYPTO_w_lock(CRYPTO_LOCK_EX_DATA);
380 toret = ex_class++; 381 toret = ex_class++;
381 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA); 382 CRYPTO_w_unlock(CRYPTO_LOCK_EX_DATA);
@@ -395,9 +396,10 @@ int_cleanup(void)
395static int 396static int
396int_get_new_index(int class_index, long argl, void *argp, 397int_get_new_index(int class_index, long argl, void *argp,
397 CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func, 398 CRYPTO_EX_new *new_func, CRYPTO_EX_dup *dup_func,
398CRYPTO_EX_free *free_func) 399 CRYPTO_EX_free *free_func)
399{ 400{
400 EX_CLASS_ITEM *item = def_get_class(class_index); 401 EX_CLASS_ITEM *item = def_get_class(class_index);
402
401 if (!item) 403 if (!item)
402 return -1; 404 return -1;
403 return def_add_index(item, argl, argp, new_func, dup_func, free_func); 405 return def_add_index(item, argl, argp, new_func, dup_func, free_func);
@@ -408,13 +410,13 @@ CRYPTO_EX_free *free_func)
408 * the global "ex_data" state (ie. class definitions), not thread-safe on 'ad' 410 * the global "ex_data" state (ie. class definitions), not thread-safe on 'ad'
409 * itself. */ 411 * itself. */
410static int 412static int
411int_new_ex_data(int class_index, void *obj, 413int_new_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
412 CRYPTO_EX_DATA *ad)
413{ 414{
414 int mx, i; 415 int mx, i;
415 void *ptr; 416 void *ptr;
416 CRYPTO_EX_DATA_FUNCS **storage = NULL; 417 CRYPTO_EX_DATA_FUNCS **storage = NULL;
417 EX_CLASS_ITEM *item = def_get_class(class_index); 418 EX_CLASS_ITEM *item = def_get_class(class_index);
419
418 if (!item) 420 if (!item)
419 /* error is already set */ 421 /* error is already set */
420 return 0; 422 return 0;
@@ -426,7 +428,8 @@ int_new_ex_data(int class_index, void *obj,
426 if (!storage) 428 if (!storage)
427 goto skip; 429 goto skip;
428 for (i = 0; i < mx; i++) 430 for (i = 0; i < mx; i++)
429 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i); 431 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
432 item->meth, i);
430 } 433 }
431skip: 434skip:
432 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA); 435 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -438,7 +441,7 @@ skip:
438 if (storage[i] && storage[i]->new_func) { 441 if (storage[i] && storage[i]->new_func) {
439 ptr = CRYPTO_get_ex_data(ad, i); 442 ptr = CRYPTO_get_ex_data(ad, i);
440 storage[i]->new_func(obj, ptr, ad, i, 443 storage[i]->new_func(obj, ptr, ad, i,
441 storage[i]->argl, storage[i]->argp); 444 storage[i]->argl, storage[i]->argp);
442 } 445 }
443 } 446 }
444 if (storage) 447 if (storage)
@@ -448,13 +451,13 @@ skip:
448 451
449/* Same thread-safety notes as for "int_new_ex_data" */ 452/* Same thread-safety notes as for "int_new_ex_data" */
450static int 453static int
451int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, 454int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to, CRYPTO_EX_DATA *from)
452 CRYPTO_EX_DATA *from)
453{ 455{
454 int mx, j, i; 456 int mx, j, i;
455 char *ptr; 457 char *ptr;
456 CRYPTO_EX_DATA_FUNCS **storage = NULL; 458 CRYPTO_EX_DATA_FUNCS **storage = NULL;
457 EX_CLASS_ITEM *item; 459 EX_CLASS_ITEM *item;
460
458 if (!from->sk) 461 if (!from->sk)
459 /* 'to' should be "blank" which *is* just like 'from' */ 462 /* 'to' should be "blank" which *is* just like 'from' */
460 return 1; 463 return 1;
@@ -470,7 +473,8 @@ int_dup_ex_data(int class_index, CRYPTO_EX_DATA *to,
470 if (!storage) 473 if (!storage)
471 goto skip; 474 goto skip;
472 for (i = 0; i < mx; i++) 475 for (i = 0; i < mx; i++)
473 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i); 476 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
477 item->meth, i);
474 } 478 }
475skip: 479skip:
476 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA); 480 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -507,7 +511,8 @@ int_free_ex_data(int class_index, void *obj, CRYPTO_EX_DATA *ad)
507 if (!storage) 511 if (!storage)
508 goto skip; 512 goto skip;
509 for (i = 0; i < mx; i++) 513 for (i = 0; i < mx; i++)
510 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(item->meth, i); 514 storage[i] = sk_CRYPTO_EX_DATA_FUNCS_value(
515 item->meth, i);
511 } 516 }
512skip: 517skip:
513 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA); 518 CRYPTO_r_unlock(CRYPTO_LOCK_EX_DATA);
@@ -519,7 +524,7 @@ skip:
519 if (storage[i] && storage[i]->free_func) { 524 if (storage[i] && storage[i]->free_func) {
520 ptr = CRYPTO_get_ex_data(ad, i); 525 ptr = CRYPTO_get_ex_data(ad, i);
521 storage[i]->free_func(obj, ptr, ad, i, 526 storage[i]->free_func(obj, ptr, ad, i,
522 storage[i]->argl, storage[i]->argp); 527 storage[i]->argl, storage[i]->argp);
523 } 528 }
524 } 529 }
525 if (storage) 530 if (storage)
@@ -563,7 +568,7 @@ CRYPTO_get_ex_new_index(int class_index, long argl, void *argp,
563 568
564 IMPL_CHECK 569 IMPL_CHECK
565 ret = EX_IMPL(get_new_index)(class_index, 570 ret = EX_IMPL(get_new_index)(class_index,
566 argl, argp, new_func, dup_func, free_func); 571 argl, argp, new_func, dup_func, free_func);
567 return ret; 572 return ret;
568} 573}
569 574
@@ -603,7 +608,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
603 608
604 if (ad->sk == NULL) { 609 if (ad->sk == NULL) {
605 if ((ad->sk = sk_void_new_null()) == NULL) { 610 if ((ad->sk = sk_void_new_null()) == NULL) {
606 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE); 611 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
612 ERR_R_MALLOC_FAILURE);
607 return (0); 613 return (0);
608 } 614 }
609 } 615 }
@@ -611,7 +617,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
611 617
612 while (i <= idx) { 618 while (i <= idx) {
613 if (!sk_void_push(ad->sk, NULL)) { 619 if (!sk_void_push(ad->sk, NULL)) {
614 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA, ERR_R_MALLOC_FAILURE); 620 CRYPTOerr(CRYPTO_F_CRYPTO_SET_EX_DATA,
621 ERR_R_MALLOC_FAILURE);
615 return (0); 622 return (0);
616 } 623 }
617 i++; 624 i++;
diff --git a/src/lib/libssl/src/crypto/malloc-wrapper.c b/src/lib/libssl/src/crypto/malloc-wrapper.c
index c754df40e3..68af818230 100644
--- a/src/lib/libssl/src/crypto/malloc-wrapper.c
+++ b/src/lib/libssl/src/crypto/malloc-wrapper.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: malloc-wrapper.c,v 1.2 2014/04/17 20:44:45 tedu Exp $ */ 1/* $OpenBSD: malloc-wrapper.c,v 1.3 2014/04/20 14:32:19 jsing Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Bob Beck 3 * Copyright (c) 2014 Bob Beck
4 * 4 *
@@ -154,7 +154,7 @@ CRYPTO_realloc(void *ptr, int num, const char *file, int line)
154 154
155void * 155void *
156CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file, 156CRYPTO_realloc_clean(void *ptr, int old_len, int num, const char *file,
157int line) 157 int line)
158{ 158{
159 void *ret = NULL; 159 void *ret = NULL;
160 160
diff --git a/src/lib/libssl/src/crypto/md32_common.h b/src/lib/libssl/src/crypto/md32_common.h
index 3e02776d30..be097bfc70 100644
--- a/src/lib/libssl/src/crypto/md32_common.h
+++ b/src/lib/libssl/src/crypto/md32_common.h
@@ -7,7 +7,7 @@
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
11 * 11 *
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in 13 * notice, this list of conditions and the following disclaimer in
@@ -377,7 +377,7 @@ int HASH_FINAL (unsigned char *md, HASH_CTX *c)
377 * *either* case. Now declaring 'em long excuses the compiler 377 * *either* case. Now declaring 'em long excuses the compiler
378 * from keeping 32 MSBs zeroed resulting in 13% performance 378 * from keeping 32 MSBs zeroed resulting in 13% performance
379 * improvement under SPARC Solaris7/64 and 5% under AlphaLinux. 379 * improvement under SPARC Solaris7/64 and 5% under AlphaLinux.
380 * Well, to be honest it should say that this *prevents* 380 * Well, to be honest it should say that this *prevents*
381 * performance degradation. 381 * performance degradation.
382 * <appro@fy.chalmers.se> 382 * <appro@fy.chalmers.se>
383 */ 383 */
diff --git a/src/lib/libssl/src/crypto/mem_dbg.c b/src/lib/libssl/src/crypto/mem_dbg.c
index fad6a58496..3b51be61f7 100644
--- a/src/lib/libssl/src/crypto/mem_dbg.c
+++ b/src/lib/libssl/src/crypto/mem_dbg.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
@@ -63,7 +63,7 @@
63 * are met: 63 * are met:
64 * 64 *
65 * 1. Redistributions of source code must retain the above copyright 65 * 1. Redistributions of source code must retain the above copyright
66 * notice, this list of conditions and the following disclaimer. 66 * notice, this list of conditions and the following disclaimer.
67 * 67 *
68 * 2. Redistributions in binary form must reproduce the above copyright 68 * 2. Redistributions in binary form must reproduce the above copyright
69 * notice, this list of conditions and the following disclaimer in 69 * notice, this list of conditions and the following disclaimer in
@@ -127,7 +127,7 @@ CRYPTO_mem_ctrl(int mode)
127int 127int
128CRYPTO_is_mem_check_on(void) 128CRYPTO_is_mem_check_on(void)
129{ 129{
130 return(0); 130 return (0);
131} 131}
132 132
133 133
@@ -140,25 +140,25 @@ CRYPTO_dbg_set_options(long bits)
140long 140long
141CRYPTO_dbg_get_options(void) 141CRYPTO_dbg_get_options(void)
142{ 142{
143 return(0); 143 return (0);
144} 144}
145 145
146int 146int
147CRYPTO_push_info_(const char *info, const char *file, int line) 147CRYPTO_push_info_(const char *info, const char *file, int line)
148{ 148{
149 return(0); 149 return (0);
150} 150}
151 151
152int 152int
153CRYPTO_pop_info(void) 153CRYPTO_pop_info(void)
154{ 154{
155 return(0); 155 return (0);
156} 156}
157 157
158int 158int
159CRYPTO_remove_all_info(void) 159CRYPTO_remove_all_info(void)
160{ 160{
161 return(0); 161 return (0);
162} 162}
163 163
164void 164void
diff --git a/src/lib/libssl/src/crypto/o_time.c b/src/lib/libssl/src/crypto/o_time.c
index 000372d35b..287aaae7ab 100644
--- a/src/lib/libssl/src/crypto/o_time.c
+++ b/src/lib/libssl/src/crypto/o_time.c
@@ -13,7 +13,7 @@
13 * are met: 13 * are met:
14 * 14 *
15 * 1. Redistributions of source code must retain the above copyright 15 * 1. Redistributions of source code must retain the above copyright
16 * notice, this list of conditions and the following disclaimer. 16 * notice, this list of conditions and the following disclaimer.
17 * 17 *
18 * 2. Redistributions in binary form must reproduce the above copyright 18 * 2. Redistributions in binary form must reproduce the above copyright
19 * notice, this list of conditions and the following disclaimer in 19 * notice, this list of conditions and the following disclaimer in
@@ -192,19 +192,19 @@ check_time(long offset)
192 gmtime_r(&t1, &tm1); 192 gmtime_r(&t1, &tm1);
193 OPENSSL_gmtime_adj(&tm1, 0, offset); 193 OPENSSL_gmtime_adj(&tm1, 0, offset);
194 if ((tm1.tm_year == tm2.tm_year) && 194 if ((tm1.tm_year == tm2.tm_year) &&
195 (tm1.tm_mon == tm2.tm_mon) && 195 (tm1.tm_mon == tm2.tm_mon) &&
196 (tm1.tm_mday == tm2.tm_mday) && 196 (tm1.tm_mday == tm2.tm_mday) &&
197 (tm1.tm_hour == tm2.tm_hour) && 197 (tm1.tm_hour == tm2.tm_hour) &&
198 (tm1.tm_min == tm2.tm_min) && 198 (tm1.tm_min == tm2.tm_min) &&
199 (tm1.tm_sec == tm2.tm_sec)) 199 (tm1.tm_sec == tm2.tm_sec))
200 return 1; 200 return 1;
201 fprintf(stderr, "TIME ERROR!!\n"); 201 fprintf(stderr, "TIME ERROR!!\n");
202 fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n", 202 fprintf(stderr, "Time1: %d/%d/%d, %d:%02d:%02d\n",
203 tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900, 203 tm2.tm_mday, tm2.tm_mon + 1, tm2.tm_year + 1900,
204 tm2.tm_hour, tm2.tm_min, tm2.tm_sec); 204 tm2.tm_hour, tm2.tm_min, tm2.tm_sec);
205 fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n", 205 fprintf(stderr, "Time2: %d/%d/%d, %d:%02d:%02d\n",
206 tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900, 206 tm1.tm_mday, tm1.tm_mon + 1, tm1.tm_year + 1900,
207 tm1.tm_hour, tm1.tm_min, tm1.tm_sec); 207 tm1.tm_hour, tm1.tm_min, tm1.tm_sec);
208 return 0; 208 return 0;
209} 209}
210 210
diff --git a/src/lib/libssl/src/crypto/o_time.h b/src/lib/libssl/src/crypto/o_time.h
index 4f8288f5d5..086f5d6e71 100644
--- a/src/lib/libssl/src/crypto/o_time.h
+++ b/src/lib/libssl/src/crypto/o_time.h
@@ -10,7 +10,7 @@
10 * are met: 10 * are met:
11 * 11 *
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 14 *
15 * 2. Redistributions in binary form must reproduce the above copyright 15 * 2. Redistributions in binary form must reproduce the above copyright
16 * notice, this list of conditions and the following disclaimer in 16 * notice, this list of conditions and the following disclaimer in
diff --git a/src/lib/libssl/src/crypto/ossl_typ.h b/src/lib/libssl/src/crypto/ossl_typ.h
index 3c360b0d9b..3a7a66edef 100644
--- a/src/lib/libssl/src/crypto/ossl_typ.h
+++ b/src/lib/libssl/src/crypto/ossl_typ.h
@@ -6,7 +6,7 @@
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
11 * 2. Redistributions in binary form must reproduce the above copyright 11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in 12 * notice, this list of conditions and the following disclaimer in
diff --git a/src/lib/libssl/src/crypto/ppccap.c b/src/lib/libssl/src/crypto/ppccap.c
index 16cc9c445e..4d7dd38dd1 100644
--- a/src/lib/libssl/src/crypto/ppccap.c
+++ b/src/lib/libssl/src/crypto/ppccap.c
@@ -90,7 +90,7 @@ OPENSSL_cpuid_setup(void)
90#if defined(_AIX) 90#if defined(_AIX)
91 if (sizeof(size_t) == 4 91 if (sizeof(size_t) == 4
92# if defined(_SC_AIX_KERNEL_BITMODE) 92# if defined(_SC_AIX_KERNEL_BITMODE)
93 && sysconf(_SC_AIX_KERNEL_BITMODE) != 64 93 && sysconf(_SC_AIX_KERNEL_BITMODE) != 64
94# endif 94# endif
95 ) 95 )
96 return; 96 return;
diff --git a/src/lib/libssl/src/crypto/sparcv9cap.c b/src/lib/libssl/src/crypto/sparcv9cap.c
index f49e71ec93..36aacb0e00 100644
--- a/src/lib/libssl/src/crypto/sparcv9cap.c
+++ b/src/lib/libssl/src/crypto/sparcv9cap.c
@@ -34,7 +34,8 @@ void _sparcv9_vis2_probe(void);
34void _sparcv9_fmadd_probe(void); 34void _sparcv9_fmadd_probe(void);
35 35
36static sigjmp_buf common_jmp; 36static sigjmp_buf common_jmp;
37static void common_handler(int sig) 37static void
38common_handler(int sig)
38{ 39{
39 siglongjmp(common_jmp, sig); 40 siglongjmp(common_jmp, sig);
40} 41}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-11-01 21:34:25 +0000