summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/libcrypto/aes/aes_misc.c5
-rw-r--r--src/lib/libcrypto/bio/bf_buff.c4
-rw-r--r--src/lib/libcrypto/bio/bf_lbuf.c4
-rw-r--r--src/lib/libcrypto/bio/bf_nbio.c4
-rw-r--r--src/lib/libcrypto/bio/bf_null.c4
-rw-r--r--src/lib/libcrypto/bio/bio_lib.c36
-rw-r--r--src/lib/libcrypto/bio/bss_acpt.c12
-rw-r--r--src/lib/libcrypto/bio/bss_bio.c4
-rw-r--r--src/lib/libcrypto/bio/bss_conn.c12
-rw-r--r--src/lib/libcrypto/bio/bss_dgram.c16
-rw-r--r--src/lib/libcrypto/bio/bss_fd.c8
-rw-r--r--src/lib/libcrypto/bio/bss_file.c12
-rw-r--r--src/lib/libcrypto/bio/bss_log.c4
-rw-r--r--src/lib/libcrypto/bio/bss_mem.c8
-rw-r--r--src/lib/libcrypto/bio/bss_null.c4
-rw-r--r--src/lib/libcrypto/bio/bss_sock.c8
-rw-r--r--src/lib/libcrypto/cryptlib.c46
-rw-r--r--src/lib/libcrypto/cversion.c4
-rw-r--r--src/lib/libcrypto/ex_data.c12
-rw-r--r--src/lib/libcrypto/x509/by_dir.c4
-rw-r--r--src/lib/libcrypto/x509/by_file.c4
-rw-r--r--src/lib/libcrypto/x509/x_all.c120
-rw-r--r--src/lib/libssl/src/crypto/aes/aes_misc.c5
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_buff.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_lbuf.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_nbio.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bf_null.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bio_lib.c36
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_acpt.c12
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_bio.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_conn.c12
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_dgram.c16
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_fd.c8
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_file.c12
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_log.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_mem.c8
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_null.c4
-rw-r--r--src/lib/libssl/src/crypto/bio/bss_sock.c8
-rw-r--r--src/lib/libssl/src/crypto/cryptlib.c46
-rw-r--r--src/lib/libssl/src/crypto/cversion.c4
-rw-r--r--src/lib/libssl/src/crypto/ex_data.c12
-rw-r--r--src/lib/libssl/src/crypto/x509/by_dir.c4
-rw-r--r--src/lib/libssl/src/crypto/x509/by_file.c4
-rw-r--r--src/lib/libssl/src/crypto/x509/x_all.c120
44 files changed, 332 insertions, 338 deletions
diff --git a/src/lib/libcrypto/aes/aes_misc.c b/src/lib/libcrypto/aes/aes_misc.c
index 9380abc46c..ba2fcd7d80 100644
--- a/src/lib/libcrypto/aes/aes_misc.c
+++ b/src/lib/libcrypto/aes/aes_misc.c
@@ -56,8 +56,9 @@
56 56
57const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; 57const char AES_version[]="AES" OPENSSL_VERSION_PTEXT;
58 58
59const char 59const char *
60*AES_options(void) { 60AES_options(void)
61{
61#ifdef FULL_UNROLL 62#ifdef FULL_UNROLL
62 return "aes(full)"; 63 return "aes(full)";
63#else 64#else
diff --git a/src/lib/libcrypto/bio/bf_buff.c b/src/lib/libcrypto/bio/bf_buff.c
index be2ebab148..7b76e895a4 100644
--- a/src/lib/libcrypto/bio/bf_buff.c
+++ b/src/lib/libcrypto/bio/bf_buff.c
@@ -84,8 +84,8 @@ static BIO_METHOD methods_buffer = {
84 buffer_callback_ctrl, 84 buffer_callback_ctrl,
85}; 85};
86 86
87BIO_METHOD 87BIO_METHOD *
88*BIO_f_buffer(void) 88BIO_f_buffer(void)
89{ 89{
90 return (&methods_buffer); 90 return (&methods_buffer);
91} 91}
diff --git a/src/lib/libcrypto/bio/bf_lbuf.c b/src/lib/libcrypto/bio/bf_lbuf.c
index 5020795ded..e233cbc92c 100644
--- a/src/lib/libcrypto/bio/bf_lbuf.c
+++ b/src/lib/libcrypto/bio/bf_lbuf.c
@@ -89,8 +89,8 @@ static BIO_METHOD methods_linebuffer = {
89 linebuffer_callback_ctrl, 89 linebuffer_callback_ctrl,
90}; 90};
91 91
92BIO_METHOD 92BIO_METHOD *
93*BIO_f_linebuffer(void) 93BIO_f_linebuffer(void)
94{ 94{
95 return (&methods_linebuffer); 95 return (&methods_linebuffer);
96} 96}
diff --git a/src/lib/libcrypto/bio/bf_nbio.c b/src/lib/libcrypto/bio/bf_nbio.c
index 200ca706ff..48c9781700 100644
--- a/src/lib/libcrypto/bio/bf_nbio.c
+++ b/src/lib/libcrypto/bio/bf_nbio.c
@@ -93,8 +93,8 @@ static BIO_METHOD methods_nbiof = {
93 nbiof_callback_ctrl, 93 nbiof_callback_ctrl,
94}; 94};
95 95
96BIO_METHOD 96BIO_METHOD *
97*BIO_f_nbio_test(void) 97BIO_f_nbio_test(void)
98{ 98{
99 return (&methods_nbiof); 99 return (&methods_nbiof);
100} 100}
diff --git a/src/lib/libcrypto/bio/bf_null.c b/src/lib/libcrypto/bio/bf_null.c
index ada677c91e..3bba2afe98 100644
--- a/src/lib/libcrypto/bio/bf_null.c
+++ b/src/lib/libcrypto/bio/bf_null.c
@@ -86,8 +86,8 @@ static BIO_METHOD methods_nullf = {
86 nullf_callback_ctrl, 86 nullf_callback_ctrl,
87}; 87};
88 88
89BIO_METHOD 89BIO_METHOD *
90*BIO_f_null(void) 90BIO_f_null(void)
91{ 91{
92 return (&methods_nullf); 92 return (&methods_nullf);
93} 93}
diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index c226d943af..485374931b 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -63,8 +63,8 @@
63#include <openssl/bio.h> 63#include <openssl/bio.h>
64#include <openssl/stack.h> 64#include <openssl/stack.h>
65 65
66BIO 66BIO *
67*BIO_new(BIO_METHOD *method) 67BIO_new(BIO_METHOD *method)
68{ 68{
69 BIO *ret = NULL; 69 BIO *ret = NULL;
70 70
@@ -352,8 +352,8 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
352 return (BIO_ctrl(b, cmd, larg, (char *)&i)); 352 return (BIO_ctrl(b, cmd, larg, (char *)&i));
353} 353}
354 354
355char 355char *
356*BIO_ptr_ctrl(BIO *b, int cmd, long larg) 356BIO_ptr_ctrl(BIO *b, int cmd, long larg)
357{ 357{
358 char *p = NULL; 358 char *p = NULL;
359 359
@@ -435,8 +435,8 @@ BIO_ctrl_wpending(BIO *bio)
435 435
436 436
437/* put the 'bio' on the end of b's list of operators */ 437/* put the 'bio' on the end of b's list of operators */
438BIO 438BIO *
439*BIO_push(BIO *b, BIO *bio) 439BIO_push(BIO *b, BIO *bio)
440{ 440{
441 BIO *lb; 441 BIO *lb;
442 442
@@ -454,8 +454,8 @@ BIO
454} 454}
455 455
456/* Remove the first and return the rest */ 456/* Remove the first and return the rest */
457BIO 457BIO *
458*BIO_pop(BIO *b) 458BIO_pop(BIO *b)
459{ 459{
460 BIO *ret; 460 BIO *ret;
461 461
@@ -475,8 +475,8 @@ BIO
475 return (ret); 475 return (ret);
476} 476}
477 477
478BIO 478BIO *
479*BIO_get_retry_BIO(BIO *bio, int *reason) 479BIO_get_retry_BIO(BIO *bio, int *reason)
480{ 480{
481 BIO *b, *last; 481 BIO *b, *last;
482 482
@@ -500,8 +500,8 @@ BIO_get_retry_reason(BIO *bio)
500 return (bio->retry_reason); 500 return (bio->retry_reason);
501} 501}
502 502
503BIO 503BIO *
504*BIO_find_type(BIO *bio, int type) 504BIO_find_type(BIO *bio, int type)
505{ 505{
506 int mt, mask; 506 int mt, mask;
507 507
@@ -522,8 +522,8 @@ BIO
522 return (NULL); 522 return (NULL);
523} 523}
524 524
525BIO 525BIO *
526*BIO_next(BIO *b) 526BIO_next(BIO *b)
527{ 527{
528 if (!b) 528 if (!b)
529 return NULL; 529 return NULL;
@@ -547,8 +547,8 @@ BIO_free_all(BIO *bio)
547 } 547 }
548} 548}
549 549
550BIO 550BIO *
551*BIO_dup_chain(BIO *in) 551BIO_dup_chain(BIO *in)
552{ 552{
553 BIO *ret = NULL, *eoc = NULL, *bio, *new_bio; 553 BIO *ret = NULL, *eoc = NULL, *bio, *new_bio;
554 554
@@ -611,8 +611,8 @@ BIO_set_ex_data(BIO *bio, int idx, void *data)
611 return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data)); 611 return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data));
612} 612}
613 613
614void 614void *
615*BIO_get_ex_data(BIO *bio, int idx) 615BIO_get_ex_data(BIO *bio, int idx)
616{ 616{
617 return (CRYPTO_get_ex_data(&(bio->ex_data), idx)); 617 return (CRYPTO_get_ex_data(&(bio->ex_data), idx));
618} 618}
diff --git a/src/lib/libcrypto/bio/bss_acpt.c b/src/lib/libcrypto/bio/bss_acpt.c
index 161b5d01f8..a272ada366 100644
--- a/src/lib/libcrypto/bio/bss_acpt.c
+++ b/src/lib/libcrypto/bio/bss_acpt.c
@@ -110,8 +110,8 @@ static BIO_METHOD methods_acceptp = {
110 NULL, 110 NULL,
111}; 111};
112 112
113BIO_METHOD 113BIO_METHOD *
114*BIO_s_accept(void) 114BIO_s_accept(void)
115{ 115{
116 return (&methods_acceptp); 116 return (&methods_acceptp);
117} 117}
@@ -132,8 +132,8 @@ acpt_new(BIO *bi)
132 return (1); 132 return (1);
133} 133}
134 134
135static BIO_ACCEPT 135static BIO_ACCEPT *
136*BIO_ACCEPT_new(void) 136BIO_ACCEPT_new(void)
137{ 137{
138 BIO_ACCEPT *ret; 138 BIO_ACCEPT *ret;
139 139
@@ -443,8 +443,8 @@ acpt_puts(BIO *bp, const char *str)
443 return (ret); 443 return (ret);
444} 444}
445 445
446BIO 446BIO *
447*BIO_new_accept(char *str) 447BIO_new_accept(char *str)
448{ 448{
449 BIO *ret; 449 BIO *ret;
450 450
diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index 4d93aba0a4..33a0709aaf 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -116,8 +116,8 @@ static BIO_METHOD methods_biop = {
116 NULL /* no bio_callback_ctrl */ 116 NULL /* no bio_callback_ctrl */
117}; 117};
118 118
119BIO_METHOD 119BIO_METHOD *
120*BIO_s_bio(void) 120BIO_s_bio(void)
121{ 121{
122 return &methods_biop; 122 return &methods_biop;
123} 123}
diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 78ce240648..9c5320cafb 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -288,8 +288,8 @@ end:
288 return (ret); 288 return (ret);
289} 289}
290 290
291BIO_CONNECT 291BIO_CONNECT *
292*BIO_CONNECT_new(void) 292BIO_CONNECT_new(void)
293{ 293{
294 BIO_CONNECT *ret; 294 BIO_CONNECT *ret;
295 295
@@ -322,8 +322,8 @@ BIO_CONNECT_free(BIO_CONNECT *a)
322 free(a); 322 free(a);
323} 323}
324 324
325BIO_METHOD 325BIO_METHOD *
326*BIO_s_connect(void) 326BIO_s_connect(void)
327{ 327{
328 return (&methods_connectp); 328 return (&methods_connectp);
329} 329}
@@ -592,8 +592,8 @@ conn_puts(BIO *bp, const char *str)
592 return (ret); 592 return (ret);
593} 593}
594 594
595BIO 595BIO *
596*BIO_new_connect(char *str) 596BIO_new_connect(char *str)
597{ 597{
598 BIO *ret; 598 BIO *ret;
599 599
diff --git a/src/lib/libcrypto/bio/bss_dgram.c b/src/lib/libcrypto/bio/bss_dgram.c
index e0445fc97e..4c54601abc 100644
--- a/src/lib/libcrypto/bio/bss_dgram.c
+++ b/src/lib/libcrypto/bio/bss_dgram.c
@@ -187,14 +187,14 @@ typedef struct bio_dgram_sctp_data_st {
187} bio_dgram_sctp_data; 187} bio_dgram_sctp_data;
188#endif 188#endif
189 189
190BIO_METHOD 190BIO_METHOD *
191*BIO_s_datagram(void) 191BIO_s_datagram(void)
192{ 192{
193 return (&methods_dgramp); 193 return (&methods_dgramp);
194} 194}
195 195
196BIO 196BIO *
197*BIO_new_dgram(int fd, int close_flag) 197BIO_new_dgram(int fd, int close_flag)
198{ 198{
199 BIO *ret; 199 BIO *ret;
200 200
@@ -764,14 +764,14 @@ dgram_puts(BIO *bp, const char *str)
764} 764}
765 765
766#ifndef OPENSSL_NO_SCTP 766#ifndef OPENSSL_NO_SCTP
767BIO_METHOD 767BIO_METHOD *
768*BIO_s_datagram_sctp(void) 768BIO_s_datagram_sctp(void)
769{ 769{
770 return (&methods_dgramp_sctp); 770 return (&methods_dgramp_sctp);
771} 771}
772 772
773BIO 773BIO *
774*BIO_new_dgram_sctp(int fd, int close_flag) 774BIO_new_dgram_sctp(int fd, int close_flag)
775{ 775{
776 BIO *bio; 776 BIO *bio;
777 int ret, optval = 20000; 777 int ret, optval = 20000;
diff --git a/src/lib/libcrypto/bio/bss_fd.c b/src/lib/libcrypto/bio/bss_fd.c
index 988104e77c..4369d6411d 100644
--- a/src/lib/libcrypto/bio/bss_fd.c
+++ b/src/lib/libcrypto/bio/bss_fd.c
@@ -90,14 +90,14 @@ static BIO_METHOD methods_fdp = {
90 NULL, 90 NULL,
91}; 91};
92 92
93BIO_METHOD 93BIO_METHOD *
94*BIO_s_fd(void) 94BIO_s_fd(void)
95{ 95{
96 return (&methods_fdp); 96 return (&methods_fdp);
97} 97}
98 98
99BIO 99BIO *
100*BIO_new_fd(int fd, int close_flag) 100BIO_new_fd(int fd, int close_flag)
101{ 101{
102 BIO *ret; 102 BIO *ret;
103 ret = BIO_new(BIO_s_fd()); 103 ret = BIO_new(BIO_s_fd());
diff --git a/src/lib/libcrypto/bio/bss_file.c b/src/lib/libcrypto/bio/bss_file.c
index c92c4753aa..995c623341 100644
--- a/src/lib/libcrypto/bio/bss_file.c
+++ b/src/lib/libcrypto/bio/bss_file.c
@@ -112,8 +112,8 @@ static BIO_METHOD methods_filep = {
112 NULL, 112 NULL,
113}; 113};
114 114
115BIO 115BIO *
116*BIO_new_file(const char *filename, const char *mode) 116BIO_new_file(const char *filename, const char *mode)
117{ 117{
118 BIO *ret; 118 BIO *ret;
119 FILE *file = NULL; 119 FILE *file = NULL;
@@ -138,8 +138,8 @@ BIO
138 return (ret); 138 return (ret);
139} 139}
140 140
141BIO 141BIO *
142*BIO_new_fp(FILE *stream, int close_flag) 142BIO_new_fp(FILE *stream, int close_flag)
143{ 143{
144 BIO *ret; 144 BIO *ret;
145 145
@@ -150,8 +150,8 @@ BIO
150 return (ret); 150 return (ret);
151} 151}
152 152
153BIO_METHOD 153BIO_METHOD *
154*BIO_s_file(void) 154BIO_s_file(void)
155{ 155{
156 return (&methods_filep); 156 return (&methods_filep);
157} 157}
diff --git a/src/lib/libcrypto/bio/bss_log.c b/src/lib/libcrypto/bio/bss_log.c
index cde3c858f1..342176f82e 100644
--- a/src/lib/libcrypto/bio/bss_log.c
+++ b/src/lib/libcrypto/bio/bss_log.c
@@ -97,8 +97,8 @@ static BIO_METHOD methods_slg = {
97 NULL, 97 NULL,
98}; 98};
99 99
100BIO_METHOD 100BIO_METHOD *
101*BIO_s_log(void) 101BIO_s_log(void)
102{ 102{
103 return (&methods_slg); 103 return (&methods_slg);
104} 104}
diff --git a/src/lib/libcrypto/bio/bss_mem.c b/src/lib/libcrypto/bio/bss_mem.c
index a5192202bd..1a477c12be 100644
--- a/src/lib/libcrypto/bio/bss_mem.c
+++ b/src/lib/libcrypto/bio/bss_mem.c
@@ -85,14 +85,14 @@ static BIO_METHOD mem_method = {
85/* bio->num is used to hold the value to return on 'empty', if it is 85/* bio->num is used to hold the value to return on 'empty', if it is
86 * 0, should_retry is not set */ 86 * 0, should_retry is not set */
87 87
88BIO_METHOD 88BIO_METHOD *
89*BIO_s_mem(void) 89BIO_s_mem(void)
90{ 90{
91 return (&mem_method); 91 return (&mem_method);
92} 92}
93 93
94BIO 94BIO *
95*BIO_new_mem_buf(void *buf, int len) 95BIO_new_mem_buf(void *buf, int len)
96{ 96{
97 BIO *ret; 97 BIO *ret;
98 BUF_MEM *b; 98 BUF_MEM *b;
diff --git a/src/lib/libcrypto/bio/bss_null.c b/src/lib/libcrypto/bio/bss_null.c
index 51aed2ac4b..c7289725d9 100644
--- a/src/lib/libcrypto/bio/bss_null.c
+++ b/src/lib/libcrypto/bio/bss_null.c
@@ -82,8 +82,8 @@ static BIO_METHOD null_method = {
82 NULL, 82 NULL,
83}; 83};
84 84
85BIO_METHOD 85BIO_METHOD *
86*BIO_s_null(void) 86BIO_s_null(void)
87{ 87{
88 return (&null_method); 88 return (&null_method);
89} 89}
diff --git a/src/lib/libcrypto/bio/bss_sock.c b/src/lib/libcrypto/bio/bss_sock.c
index b9cf817a0c..5335495c6e 100644
--- a/src/lib/libcrypto/bio/bss_sock.c
+++ b/src/lib/libcrypto/bio/bss_sock.c
@@ -86,14 +86,14 @@ static BIO_METHOD methods_sockp = {
86 NULL, 86 NULL,
87}; 87};
88 88
89BIO_METHOD 89BIO_METHOD *
90*BIO_s_socket(void) 90BIO_s_socket(void)
91{ 91{
92 return (&methods_sockp); 92 return (&methods_sockp);
93} 93}
94 94
95BIO 95BIO *
96*BIO_new_socket(int fd, int close_flag) 96BIO_new_socket(int fd, int close_flag)
97{ 97{
98 BIO *ret; 98 BIO *ret;
99 99
diff --git a/src/lib/libcrypto/cryptlib.c b/src/lib/libcrypto/cryptlib.c
index dc3cc2ab02..ca583d59a9 100644
--- a/src/lib/libcrypto/cryptlib.c
+++ b/src/lib/libcrypto/cryptlib.c
@@ -117,10 +117,6 @@
117#include "cryptlib.h" 117#include "cryptlib.h"
118#include <openssl/safestack.h> 118#include <openssl/safestack.h>
119 119
120#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
121static double SSLeay_MSVC5_hack = 0.0; /* and for VC1.5 */
122#endif
123
124DECLARE_STACK_OF(CRYPTO_dynlock) 120DECLARE_STACK_OF(CRYPTO_dynlock)
125 121
126/* real #defines in crypto.h, keep these upto date */ 122/* real #defines in crypto.h, keep these upto date */
@@ -316,8 +312,8 @@ CRYPTO_destroy_dynlockid(int i)
316 } 312 }
317} 313}
318 314
319struct CRYPTO_dynlock_value 315struct CRYPTO_dynlock_value *
320*CRYPTO_get_dynlock_value(int i) 316CRYPTO_get_dynlock_value(int i)
321{ 317{
322 CRYPTO_dynlock *pointer = NULL; 318 CRYPTO_dynlock *pointer = NULL;
323 if (i) 319 if (i)
@@ -337,7 +333,8 @@ struct CRYPTO_dynlock_value
337 return NULL; 333 return NULL;
338} 334}
339 335
340struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))( 336struct CRYPTO_dynlock_value *
337(*CRYPTO_get_dynlock_create_callback(void))(
341 const char *file, int line) 338 const char *file, int line)
342{ 339{
343 return (dynlock_create_callback); 340 return (dynlock_create_callback);
@@ -445,7 +442,7 @@ CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
445 const unsigned char *src = (void *)&id->ptr; 442 const unsigned char *src = (void *)&id->ptr;
446 unsigned char snum = sizeof(id->ptr); 443 unsigned char snum = sizeof(id->ptr);
447 while (snum--) 444 while (snum--)
448 accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; 445 accum += *(src++) * hash_coeffs[(snum + dnum) & 7];
449 accum += dnum; 446 accum += dnum;
450 *(dest++) = accum & 255; 447 *(dest++) = accum & 255;
451 } 448 }
@@ -613,8 +610,8 @@ CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
613 return (ret); 610 return (ret);
614} 611}
615 612
616const char 613const char *
617*CRYPTO_get_lock_name(int type) 614CRYPTO_get_lock_name(int type)
618{ 615{
619 if (type < 0) 616 if (type < 0)
620 return("dynamic"); 617 return("dynamic");
@@ -631,8 +628,8 @@ const char
631 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) 628 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
632 629
633unsigned int OPENSSL_ia32cap_P[2]; 630unsigned int OPENSSL_ia32cap_P[2];
634unsigned long 631unsigned long *
635*OPENSSL_ia32cap_loc(void) 632OPENSSL_ia32cap_loc(void)
636{ 633{
637 if (sizeof(long) == 4) 634 if (sizeof(long) == 4)
638 /* 635 /*
@@ -646,11 +643,7 @@ unsigned long
646 643
647#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) 644#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
648#define OPENSSL_CPUID_SETUP 645#define OPENSSL_CPUID_SETUP
649#if defined(_WIN32)
650typedef unsigned __int64 IA32CAP;
651#else
652typedef unsigned long long IA32CAP; 646typedef unsigned long long IA32CAP;
653#endif
654void 647void
655OPENSSL_cpuid_setup(void) 648OPENSSL_cpuid_setup(void)
656{ 649{
@@ -665,11 +658,8 @@ OPENSSL_cpuid_setup(void)
665 trigger = 1; 658 trigger = 1;
666 if ((env = getenv("OPENSSL_ia32cap"))) { 659 if ((env = getenv("OPENSSL_ia32cap"))) {
667 int off = (env[0]=='~') ? 1 : 0; 660 int off = (env[0]=='~') ? 1 : 0;
668#if defined(_WIN32) 661 if (!sscanf(env+off, "%lli",(long long *)&vec))
669 if (!sscanf(env+off, "%I64i", &vec)) vec = strtoul(env+off, NULL, 0); 662 vec = strtoul(env+off, NULL, 0);
670#else
671 if (!sscanf(env+off, "%lli",(long long *)&vec)) vec = strtoul(env+off, NULL, 0);
672#endif
673 if (off) 663 if (off)
674 vec = OPENSSL_ia32_cpuid()&~vec; 664 vec = OPENSSL_ia32_cpuid()&~vec;
675 } else 665 } else
@@ -690,13 +680,17 @@ OPENSSL_cpuid_setup(void)
690} 680}
691#endif 681#endif
692int OPENSSL_NONPIC_relocated = 0; 682int OPENSSL_NONPIC_relocated = 0;
683
693#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) 684#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
694void 685void
695OPENSSL_cpuid_setup(void) {} 686OPENSSL_cpuid_setup(void)
687{
688}
696#endif 689#endif
697 690
698 691
699void OPENSSL_showfatal(const char *fmta, ...) 692void
693OPENSSL_showfatal(const char *fmta, ...)
700{ 694{
701 va_list ap; 695 va_list ap;
702 696
@@ -705,7 +699,8 @@ void OPENSSL_showfatal(const char *fmta, ...)
705 va_end (ap); 699 va_end (ap);
706} 700}
707 701
708int OPENSSL_isservice(void) 702int
703OPENSSL_isservice(void)
709{ 704{
710 return 0; 705 return 0;
711} 706}
@@ -719,7 +714,8 @@ OpenSSLDie(const char *file, int line, const char *assertion)
719 abort(); 714 abort();
720} 715}
721 716
722void *OPENSSL_stderr(void) 717void *
718OPENSSL_stderr(void)
723{ 719{
724 return stderr; 720 return stderr;
725} 721}
diff --git a/src/lib/libcrypto/cversion.c b/src/lib/libcrypto/cversion.c
index 74317e2e14..7ecfaf9f2f 100644
--- a/src/lib/libcrypto/cversion.c
+++ b/src/lib/libcrypto/cversion.c
@@ -58,8 +58,8 @@
58 58
59#include "cryptlib.h" 59#include "cryptlib.h"
60 60
61const char 61const char *
62*SSLeay_version(int t) 62SSLeay_version(int t)
63{ 63{
64 if (t == SSLEAY_VERSION) 64 if (t == SSLEAY_VERSION)
65 return OPENSSL_VERSION_TEXT; 65 return OPENSSL_VERSION_TEXT;
diff --git a/src/lib/libcrypto/ex_data.c b/src/lib/libcrypto/ex_data.c
index 4c09f9ee02..0b27d57b45 100644
--- a/src/lib/libcrypto/ex_data.c
+++ b/src/lib/libcrypto/ex_data.c
@@ -211,8 +211,8 @@ impl_check(void)
211#define IMPL_CHECK if(!impl) impl_check(); 211#define IMPL_CHECK if(!impl) impl_check();
212 212
213/* API functions to get/set the "ex_data" implementation */ 213/* API functions to get/set the "ex_data" implementation */
214const CRYPTO_EX_DATA_IMPL 214const CRYPTO_EX_DATA_IMPL *
215*CRYPTO_get_ex_data_implementation(void) 215CRYPTO_get_ex_data_implementation(void)
216{ 216{
217 IMPL_CHECK 217 IMPL_CHECK
218 return impl; 218 return impl;
@@ -306,8 +306,8 @@ def_cleanup_cb(void *a_void)
306 306
307/* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a 307/* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a
308 * given class. Handles locking. */ 308 * given class. Handles locking. */
309static EX_CLASS_ITEM 309static EX_CLASS_ITEM *
310*def_get_class(int class_index) 310def_get_class(int class_index)
311{ 311{
312 EX_CLASS_ITEM d, *p, *gen; 312 EX_CLASS_ITEM d, *p, *gen;
313 EX_DATA_CHECK(return NULL;) 313 EX_DATA_CHECK(return NULL;)
@@ -622,8 +622,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
622 622
623/* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a 623/* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a
624 * particular index in the class used by this variable */ 624 * particular index in the class used by this variable */
625void 625void *
626*CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) 626CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
627{ 627{
628 if (ad->sk == NULL) 628 if (ad->sk == NULL)
629 return (0); 629 return (0);
diff --git a/src/lib/libcrypto/x509/by_dir.c b/src/lib/libcrypto/x509/by_dir.c
index 3b72fd302f..76f8244f36 100644
--- a/src/lib/libcrypto/x509/by_dir.c
+++ b/src/lib/libcrypto/x509/by_dir.c
@@ -113,8 +113,8 @@ X509_LOOKUP_METHOD x509_dir_lookup = {
113 NULL, /* get_by_alias */ 113 NULL, /* get_by_alias */
114}; 114};
115 115
116X509_LOOKUP_METHOD 116X509_LOOKUP_METHOD *
117*X509_LOOKUP_hash_dir(void) 117X509_LOOKUP_hash_dir(void)
118{ 118{
119 return (&x509_dir_lookup); 119 return (&x509_dir_lookup);
120} 120}
diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 474d13bf0e..93c951ee2a 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -84,8 +84,8 @@ X509_LOOKUP_METHOD x509_file_lookup = {
84 NULL, /* get_by_alias */ 84 NULL, /* get_by_alias */
85}; 85};
86 86
87X509_LOOKUP_METHOD 87X509_LOOKUP_METHOD *
88*X509_LOOKUP_file(void) 88X509_LOOKUP_file(void)
89{ 89{
90 return (&x509_file_lookup); 90 return (&x509_file_lookup);
91} 91}
diff --git a/src/lib/libcrypto/x509/x_all.c b/src/lib/libcrypto/x509/x_all.c
index 59099f026f..2edec16022 100644
--- a/src/lib/libcrypto/x509/x_all.c
+++ b/src/lib/libcrypto/x509/x_all.c
@@ -147,8 +147,8 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
147} 147}
148 148
149#ifndef OPENSSL_NO_FP_API 149#ifndef OPENSSL_NO_FP_API
150X509 150X509 *
151*d2i_X509_fp(FILE *fp, X509 **x509) 151d2i_X509_fp(FILE *fp, X509 **x509)
152{ 152{
153 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509); 153 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509);
154} 154}
@@ -160,8 +160,8 @@ i2d_X509_fp(FILE *fp, X509 *x509)
160} 160}
161#endif 161#endif
162 162
163X509 163X509 *
164*d2i_X509_bio(BIO *bp, X509 **x509) 164d2i_X509_bio(BIO *bp, X509 **x509)
165{ 165{
166 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509); 166 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509);
167} 167}
@@ -173,8 +173,8 @@ i2d_X509_bio(BIO *bp, X509 *x509)
173} 173}
174 174
175#ifndef OPENSSL_NO_FP_API 175#ifndef OPENSSL_NO_FP_API
176X509_CRL 176X509_CRL *
177*d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) 177d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl)
178{ 178{
179 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); 179 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl);
180} 180}
@@ -186,8 +186,8 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl)
186} 186}
187#endif 187#endif
188 188
189X509_CRL 189X509_CRL *
190*d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) 190d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl)
191{ 191{
192 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); 192 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl);
193} 193}
@@ -199,8 +199,8 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl)
199} 199}
200 200
201#ifndef OPENSSL_NO_FP_API 201#ifndef OPENSSL_NO_FP_API
202PKCS7 202PKCS7 *
203*d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) 203d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
204{ 204{
205 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); 205 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7);
206} 206}
@@ -212,8 +212,8 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
212} 212}
213#endif 213#endif
214 214
215PKCS7 215PKCS7 *
216*d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) 216d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
217{ 217{
218 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); 218 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7);
219} 219}
@@ -225,8 +225,8 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
225} 225}
226 226
227#ifndef OPENSSL_NO_FP_API 227#ifndef OPENSSL_NO_FP_API
228X509_REQ 228X509_REQ *
229*d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) 229d2i_X509_REQ_fp(FILE *fp, X509_REQ **req)
230{ 230{
231 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); 231 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req);
232} 232}
@@ -238,8 +238,8 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req)
238} 238}
239#endif 239#endif
240 240
241X509_REQ 241X509_REQ *
242*d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) 242d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
243{ 243{
244 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); 244 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req);
245} 245}
@@ -253,8 +253,8 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req)
253#ifndef OPENSSL_NO_RSA 253#ifndef OPENSSL_NO_RSA
254 254
255#ifndef OPENSSL_NO_FP_API 255#ifndef OPENSSL_NO_FP_API
256RSA 256RSA *
257*d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) 257d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa)
258{ 258{
259 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); 259 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa);
260} 260}
@@ -265,15 +265,15 @@ i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa)
265 return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); 265 return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa);
266} 266}
267 267
268RSA 268RSA *
269*d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) 269d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa)
270{ 270{
271 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); 271 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa);
272} 272}
273 273
274 274
275RSA 275RSA *
276*d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) 276d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa)
277{ 277{
278 return ASN1_d2i_fp((void *(*)(void))RSA_new, 278 return ASN1_d2i_fp((void *(*)(void))RSA_new,
279 (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa); 279 (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa);
@@ -292,8 +292,8 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa)
292} 292}
293#endif 293#endif
294 294
295RSA 295RSA *
296*d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) 296d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa)
297{ 297{
298 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); 298 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa);
299} 299}
@@ -304,15 +304,15 @@ i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa)
304 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); 304 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa);
305} 305}
306 306
307RSA 307RSA *
308*d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) 308d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa)
309{ 309{
310 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); 310 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa);
311} 311}
312 312
313 313
314RSA 314RSA *
315*d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) 315d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa)
316{ 316{
317 return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa); 317 return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa);
318} 318}
@@ -332,8 +332,8 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa)
332 332
333#ifndef OPENSSL_NO_DSA 333#ifndef OPENSSL_NO_DSA
334#ifndef OPENSSL_NO_FP_API 334#ifndef OPENSSL_NO_FP_API
335DSA 335DSA *
336*d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) 336d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
337{ 337{
338 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa); 338 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa);
339} 339}
@@ -344,8 +344,8 @@ i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa)
344 return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa); 344 return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa);
345} 345}
346 346
347DSA 347DSA *
348*d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) 348d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa)
349{ 349{
350 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa); 350 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa);
351} 351}
@@ -357,8 +357,8 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa)
357} 357}
358#endif 358#endif
359 359
360DSA 360DSA *
361*d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) 361d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
362{ 362{
363 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa); 363 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa);
364} 364}
@@ -369,8 +369,8 @@ i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa)
369 return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa); 369 return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa);
370} 370}
371 371
372DSA 372DSA *
373*d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) 373d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa)
374{ 374{
375 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa); 375 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa);
376} 376}
@@ -385,8 +385,8 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa)
385 385
386#ifndef OPENSSL_NO_EC 386#ifndef OPENSSL_NO_EC
387#ifndef OPENSSL_NO_FP_API 387#ifndef OPENSSL_NO_FP_API
388EC_KEY 388EC_KEY *
389*d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) 389d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
390{ 390{
391 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey); 391 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey);
392} 392}
@@ -397,8 +397,8 @@ i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey)
397 return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey); 397 return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey);
398} 398}
399 399
400EC_KEY 400EC_KEY *
401*d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) 401d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey)
402{ 402{
403 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); 403 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey);
404} 404}
@@ -409,8 +409,8 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey)
409 return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); 409 return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
410} 410}
411#endif 411#endif
412EC_KEY 412EC_KEY *
413*d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) 413d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
414{ 414{
415 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey); 415 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey);
416} 416}
@@ -421,8 +421,8 @@ i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *ecdsa)
421 return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa); 421 return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa);
422} 422}
423 423
424EC_KEY 424EC_KEY *
425*d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) 425d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey)
426{ 426{
427 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); 427 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey);
428} 428}
@@ -488,8 +488,8 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
488 488
489 489
490#ifndef OPENSSL_NO_FP_API 490#ifndef OPENSSL_NO_FP_API
491X509_SIG 491X509_SIG *
492*d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) 492d2i_PKCS8_fp(FILE *fp, X509_SIG **p8)
493{ 493{
494 return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8); 494 return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8);
495} 495}
@@ -501,8 +501,8 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8)
501} 501}
502#endif 502#endif
503 503
504X509_SIG 504X509_SIG *
505*d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) 505d2i_PKCS8_bio(BIO *bp, X509_SIG **p8)
506{ 506{
507 return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8); 507 return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8);
508} 508}
@@ -514,8 +514,8 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
514} 514}
515 515
516#ifndef OPENSSL_NO_FP_API 516#ifndef OPENSSL_NO_FP_API
517PKCS8_PRIV_KEY_INFO 517PKCS8_PRIV_KEY_INFO *
518*d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, 518d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
519PKCS8_PRIV_KEY_INFO **p8inf) 519PKCS8_PRIV_KEY_INFO **p8inf)
520{ 520{
521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
@@ -548,8 +548,8 @@ i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey)
548 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); 548 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey);
549} 549}
550 550
551EVP_PKEY 551EVP_PKEY *
552*d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) 552d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a)
553{ 553{
554 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, 554 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey,
555 fp, a); 555 fp, a);
@@ -561,16 +561,16 @@ i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey)
561 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey); 561 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey);
562} 562}
563 563
564EVP_PKEY 564EVP_PKEY *
565*d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) 565d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
566{ 566{
567 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a); 567 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a);
568} 568}
569 569
570#endif 570#endif
571 571
572PKCS8_PRIV_KEY_INFO 572PKCS8_PRIV_KEY_INFO *
573*d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, 573d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
574PKCS8_PRIV_KEY_INFO **p8inf) 574PKCS8_PRIV_KEY_INFO **p8inf)
575{ 575{
576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
@@ -603,8 +603,8 @@ i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey)
603 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); 603 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey);
604} 604}
605 605
606EVP_PKEY 606EVP_PKEY *
607*d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) 607d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
608{ 608{
609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a); 609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a);
610} 610}
@@ -615,8 +615,8 @@ i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey)
615 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey); 615 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey);
616} 616}
617 617
618EVP_PKEY 618EVP_PKEY *
619*d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) 619d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a)
620{ 620{
621 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a); 621 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a);
622} 622}
diff --git a/src/lib/libssl/src/crypto/aes/aes_misc.c b/src/lib/libssl/src/crypto/aes/aes_misc.c
index 9380abc46c..ba2fcd7d80 100644
--- a/src/lib/libssl/src/crypto/aes/aes_misc.c
+++ b/src/lib/libssl/src/crypto/aes/aes_misc.c
@@ -56,8 +56,9 @@
56 56
57const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; 57const char AES_version[]="AES" OPENSSL_VERSION_PTEXT;
58 58
59const char 59const char *
60*AES_options(void) { 60AES_options(void)
61{
61#ifdef FULL_UNROLL 62#ifdef FULL_UNROLL
62 return "aes(full)"; 63 return "aes(full)";
63#else 64#else
diff --git a/src/lib/libssl/src/crypto/bio/bf_buff.c b/src/lib/libssl/src/crypto/bio/bf_buff.c
index be2ebab148..7b76e895a4 100644
--- a/src/lib/libssl/src/crypto/bio/bf_buff.c
+++ b/src/lib/libssl/src/crypto/bio/bf_buff.c
@@ -84,8 +84,8 @@ static BIO_METHOD methods_buffer = {
84 buffer_callback_ctrl, 84 buffer_callback_ctrl,
85}; 85};
86 86
87BIO_METHOD 87BIO_METHOD *
88*BIO_f_buffer(void) 88BIO_f_buffer(void)
89{ 89{
90 return (&methods_buffer); 90 return (&methods_buffer);
91} 91}
diff --git a/src/lib/libssl/src/crypto/bio/bf_lbuf.c b/src/lib/libssl/src/crypto/bio/bf_lbuf.c
index 5020795ded..e233cbc92c 100644
--- a/src/lib/libssl/src/crypto/bio/bf_lbuf.c
+++ b/src/lib/libssl/src/crypto/bio/bf_lbuf.c
@@ -89,8 +89,8 @@ static BIO_METHOD methods_linebuffer = {
89 linebuffer_callback_ctrl, 89 linebuffer_callback_ctrl,
90}; 90};
91 91
92BIO_METHOD 92BIO_METHOD *
93*BIO_f_linebuffer(void) 93BIO_f_linebuffer(void)
94{ 94{
95 return (&methods_linebuffer); 95 return (&methods_linebuffer);
96} 96}
diff --git a/src/lib/libssl/src/crypto/bio/bf_nbio.c b/src/lib/libssl/src/crypto/bio/bf_nbio.c
index 200ca706ff..48c9781700 100644
--- a/src/lib/libssl/src/crypto/bio/bf_nbio.c
+++ b/src/lib/libssl/src/crypto/bio/bf_nbio.c
@@ -93,8 +93,8 @@ static BIO_METHOD methods_nbiof = {
93 nbiof_callback_ctrl, 93 nbiof_callback_ctrl,
94}; 94};
95 95
96BIO_METHOD 96BIO_METHOD *
97*BIO_f_nbio_test(void) 97BIO_f_nbio_test(void)
98{ 98{
99 return (&methods_nbiof); 99 return (&methods_nbiof);
100} 100}
diff --git a/src/lib/libssl/src/crypto/bio/bf_null.c b/src/lib/libssl/src/crypto/bio/bf_null.c
index ada677c91e..3bba2afe98 100644
--- a/src/lib/libssl/src/crypto/bio/bf_null.c
+++ b/src/lib/libssl/src/crypto/bio/bf_null.c
@@ -86,8 +86,8 @@ static BIO_METHOD methods_nullf = {
86 nullf_callback_ctrl, 86 nullf_callback_ctrl,
87}; 87};
88 88
89BIO_METHOD 89BIO_METHOD *
90*BIO_f_null(void) 90BIO_f_null(void)
91{ 91{
92 return (&methods_nullf); 92 return (&methods_nullf);
93} 93}
diff --git a/src/lib/libssl/src/crypto/bio/bio_lib.c b/src/lib/libssl/src/crypto/bio/bio_lib.c
index c226d943af..485374931b 100644
--- a/src/lib/libssl/src/crypto/bio/bio_lib.c
+++ b/src/lib/libssl/src/crypto/bio/bio_lib.c
@@ -63,8 +63,8 @@
63#include <openssl/bio.h> 63#include <openssl/bio.h>
64#include <openssl/stack.h> 64#include <openssl/stack.h>
65 65
66BIO 66BIO *
67*BIO_new(BIO_METHOD *method) 67BIO_new(BIO_METHOD *method)
68{ 68{
69 BIO *ret = NULL; 69 BIO *ret = NULL;
70 70
@@ -352,8 +352,8 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
352 return (BIO_ctrl(b, cmd, larg, (char *)&i)); 352 return (BIO_ctrl(b, cmd, larg, (char *)&i));
353} 353}
354 354
355char 355char *
356*BIO_ptr_ctrl(BIO *b, int cmd, long larg) 356BIO_ptr_ctrl(BIO *b, int cmd, long larg)
357{ 357{
358 char *p = NULL; 358 char *p = NULL;
359 359
@@ -435,8 +435,8 @@ BIO_ctrl_wpending(BIO *bio)
435 435
436 436
437/* put the 'bio' on the end of b's list of operators */ 437/* put the 'bio' on the end of b's list of operators */
438BIO 438BIO *
439*BIO_push(BIO *b, BIO *bio) 439BIO_push(BIO *b, BIO *bio)
440{ 440{
441 BIO *lb; 441 BIO *lb;
442 442
@@ -454,8 +454,8 @@ BIO
454} 454}
455 455
456/* Remove the first and return the rest */ 456/* Remove the first and return the rest */
457BIO 457BIO *
458*BIO_pop(BIO *b) 458BIO_pop(BIO *b)
459{ 459{
460 BIO *ret; 460 BIO *ret;
461 461
@@ -475,8 +475,8 @@ BIO
475 return (ret); 475 return (ret);
476} 476}
477 477
478BIO 478BIO *
479*BIO_get_retry_BIO(BIO *bio, int *reason) 479BIO_get_retry_BIO(BIO *bio, int *reason)
480{ 480{
481 BIO *b, *last; 481 BIO *b, *last;
482 482
@@ -500,8 +500,8 @@ BIO_get_retry_reason(BIO *bio)
500 return (bio->retry_reason); 500 return (bio->retry_reason);
501} 501}
502 502
503BIO 503BIO *
504*BIO_find_type(BIO *bio, int type) 504BIO_find_type(BIO *bio, int type)
505{ 505{
506 int mt, mask; 506 int mt, mask;
507 507
@@ -522,8 +522,8 @@ BIO
522 return (NULL); 522 return (NULL);
523} 523}
524 524
525BIO 525BIO *
526*BIO_next(BIO *b) 526BIO_next(BIO *b)
527{ 527{
528 if (!b) 528 if (!b)
529 return NULL; 529 return NULL;
@@ -547,8 +547,8 @@ BIO_free_all(BIO *bio)
547 } 547 }
548} 548}
549 549
550BIO 550BIO *
551*BIO_dup_chain(BIO *in) 551BIO_dup_chain(BIO *in)
552{ 552{
553 BIO *ret = NULL, *eoc = NULL, *bio, *new_bio; 553 BIO *ret = NULL, *eoc = NULL, *bio, *new_bio;
554 554
@@ -611,8 +611,8 @@ BIO_set_ex_data(BIO *bio, int idx, void *data)
611 return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data)); 611 return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data));
612} 612}
613 613
614void 614void *
615*BIO_get_ex_data(BIO *bio, int idx) 615BIO_get_ex_data(BIO *bio, int idx)
616{ 616{
617 return (CRYPTO_get_ex_data(&(bio->ex_data), idx)); 617 return (CRYPTO_get_ex_data(&(bio->ex_data), idx));
618} 618}
diff --git a/src/lib/libssl/src/crypto/bio/bss_acpt.c b/src/lib/libssl/src/crypto/bio/bss_acpt.c
index 161b5d01f8..a272ada366 100644
--- a/src/lib/libssl/src/crypto/bio/bss_acpt.c
+++ b/src/lib/libssl/src/crypto/bio/bss_acpt.c
@@ -110,8 +110,8 @@ static BIO_METHOD methods_acceptp = {
110 NULL, 110 NULL,
111}; 111};
112 112
113BIO_METHOD 113BIO_METHOD *
114*BIO_s_accept(void) 114BIO_s_accept(void)
115{ 115{
116 return (&methods_acceptp); 116 return (&methods_acceptp);
117} 117}
@@ -132,8 +132,8 @@ acpt_new(BIO *bi)
132 return (1); 132 return (1);
133} 133}
134 134
135static BIO_ACCEPT 135static BIO_ACCEPT *
136*BIO_ACCEPT_new(void) 136BIO_ACCEPT_new(void)
137{ 137{
138 BIO_ACCEPT *ret; 138 BIO_ACCEPT *ret;
139 139
@@ -443,8 +443,8 @@ acpt_puts(BIO *bp, const char *str)
443 return (ret); 443 return (ret);
444} 444}
445 445
446BIO 446BIO *
447*BIO_new_accept(char *str) 447BIO_new_accept(char *str)
448{ 448{
449 BIO *ret; 449 BIO *ret;
450 450
diff --git a/src/lib/libssl/src/crypto/bio/bss_bio.c b/src/lib/libssl/src/crypto/bio/bss_bio.c
index 4d93aba0a4..33a0709aaf 100644
--- a/src/lib/libssl/src/crypto/bio/bss_bio.c
+++ b/src/lib/libssl/src/crypto/bio/bss_bio.c
@@ -116,8 +116,8 @@ static BIO_METHOD methods_biop = {
116 NULL /* no bio_callback_ctrl */ 116 NULL /* no bio_callback_ctrl */
117}; 117};
118 118
119BIO_METHOD 119BIO_METHOD *
120*BIO_s_bio(void) 120BIO_s_bio(void)
121{ 121{
122 return &methods_biop; 122 return &methods_biop;
123} 123}
diff --git a/src/lib/libssl/src/crypto/bio/bss_conn.c b/src/lib/libssl/src/crypto/bio/bss_conn.c
index 78ce240648..9c5320cafb 100644
--- a/src/lib/libssl/src/crypto/bio/bss_conn.c
+++ b/src/lib/libssl/src/crypto/bio/bss_conn.c
@@ -288,8 +288,8 @@ end:
288 return (ret); 288 return (ret);
289} 289}
290 290
291BIO_CONNECT 291BIO_CONNECT *
292*BIO_CONNECT_new(void) 292BIO_CONNECT_new(void)
293{ 293{
294 BIO_CONNECT *ret; 294 BIO_CONNECT *ret;
295 295
@@ -322,8 +322,8 @@ BIO_CONNECT_free(BIO_CONNECT *a)
322 free(a); 322 free(a);
323} 323}
324 324
325BIO_METHOD 325BIO_METHOD *
326*BIO_s_connect(void) 326BIO_s_connect(void)
327{ 327{
328 return (&methods_connectp); 328 return (&methods_connectp);
329} 329}
@@ -592,8 +592,8 @@ conn_puts(BIO *bp, const char *str)
592 return (ret); 592 return (ret);
593} 593}
594 594
595BIO 595BIO *
596*BIO_new_connect(char *str) 596BIO_new_connect(char *str)
597{ 597{
598 BIO *ret; 598 BIO *ret;
599 599
diff --git a/src/lib/libssl/src/crypto/bio/bss_dgram.c b/src/lib/libssl/src/crypto/bio/bss_dgram.c
index e0445fc97e..4c54601abc 100644
--- a/src/lib/libssl/src/crypto/bio/bss_dgram.c
+++ b/src/lib/libssl/src/crypto/bio/bss_dgram.c
@@ -187,14 +187,14 @@ typedef struct bio_dgram_sctp_data_st {
187} bio_dgram_sctp_data; 187} bio_dgram_sctp_data;
188#endif 188#endif
189 189
190BIO_METHOD 190BIO_METHOD *
191*BIO_s_datagram(void) 191BIO_s_datagram(void)
192{ 192{
193 return (&methods_dgramp); 193 return (&methods_dgramp);
194} 194}
195 195
196BIO 196BIO *
197*BIO_new_dgram(int fd, int close_flag) 197BIO_new_dgram(int fd, int close_flag)
198{ 198{
199 BIO *ret; 199 BIO *ret;
200 200
@@ -764,14 +764,14 @@ dgram_puts(BIO *bp, const char *str)
764} 764}
765 765
766#ifndef OPENSSL_NO_SCTP 766#ifndef OPENSSL_NO_SCTP
767BIO_METHOD 767BIO_METHOD *
768*BIO_s_datagram_sctp(void) 768BIO_s_datagram_sctp(void)
769{ 769{
770 return (&methods_dgramp_sctp); 770 return (&methods_dgramp_sctp);
771} 771}
772 772
773BIO 773BIO *
774*BIO_new_dgram_sctp(int fd, int close_flag) 774BIO_new_dgram_sctp(int fd, int close_flag)
775{ 775{
776 BIO *bio; 776 BIO *bio;
777 int ret, optval = 20000; 777 int ret, optval = 20000;
diff --git a/src/lib/libssl/src/crypto/bio/bss_fd.c b/src/lib/libssl/src/crypto/bio/bss_fd.c
index 988104e77c..4369d6411d 100644
--- a/src/lib/libssl/src/crypto/bio/bss_fd.c
+++ b/src/lib/libssl/src/crypto/bio/bss_fd.c
@@ -90,14 +90,14 @@ static BIO_METHOD methods_fdp = {
90 NULL, 90 NULL,
91}; 91};
92 92
93BIO_METHOD 93BIO_METHOD *
94*BIO_s_fd(void) 94BIO_s_fd(void)
95{ 95{
96 return (&methods_fdp); 96 return (&methods_fdp);
97} 97}
98 98
99BIO 99BIO *
100*BIO_new_fd(int fd, int close_flag) 100BIO_new_fd(int fd, int close_flag)
101{ 101{
102 BIO *ret; 102 BIO *ret;
103 ret = BIO_new(BIO_s_fd()); 103 ret = BIO_new(BIO_s_fd());
diff --git a/src/lib/libssl/src/crypto/bio/bss_file.c b/src/lib/libssl/src/crypto/bio/bss_file.c
index c92c4753aa..995c623341 100644
--- a/src/lib/libssl/src/crypto/bio/bss_file.c
+++ b/src/lib/libssl/src/crypto/bio/bss_file.c
@@ -112,8 +112,8 @@ static BIO_METHOD methods_filep = {
112 NULL, 112 NULL,
113}; 113};
114 114
115BIO 115BIO *
116*BIO_new_file(const char *filename, const char *mode) 116BIO_new_file(const char *filename, const char *mode)
117{ 117{
118 BIO *ret; 118 BIO *ret;
119 FILE *file = NULL; 119 FILE *file = NULL;
@@ -138,8 +138,8 @@ BIO
138 return (ret); 138 return (ret);
139} 139}
140 140
141BIO 141BIO *
142*BIO_new_fp(FILE *stream, int close_flag) 142BIO_new_fp(FILE *stream, int close_flag)
143{ 143{
144 BIO *ret; 144 BIO *ret;
145 145
@@ -150,8 +150,8 @@ BIO
150 return (ret); 150 return (ret);
151} 151}
152 152
153BIO_METHOD 153BIO_METHOD *
154*BIO_s_file(void) 154BIO_s_file(void)
155{ 155{
156 return (&methods_filep); 156 return (&methods_filep);
157} 157}
diff --git a/src/lib/libssl/src/crypto/bio/bss_log.c b/src/lib/libssl/src/crypto/bio/bss_log.c
index cde3c858f1..342176f82e 100644
--- a/src/lib/libssl/src/crypto/bio/bss_log.c
+++ b/src/lib/libssl/src/crypto/bio/bss_log.c
@@ -97,8 +97,8 @@ static BIO_METHOD methods_slg = {
97 NULL, 97 NULL,
98}; 98};
99 99
100BIO_METHOD 100BIO_METHOD *
101*BIO_s_log(void) 101BIO_s_log(void)
102{ 102{
103 return (&methods_slg); 103 return (&methods_slg);
104} 104}
diff --git a/src/lib/libssl/src/crypto/bio/bss_mem.c b/src/lib/libssl/src/crypto/bio/bss_mem.c
index a5192202bd..1a477c12be 100644
--- a/src/lib/libssl/src/crypto/bio/bss_mem.c
+++ b/src/lib/libssl/src/crypto/bio/bss_mem.c
@@ -85,14 +85,14 @@ static BIO_METHOD mem_method = {
85/* bio->num is used to hold the value to return on 'empty', if it is 85/* bio->num is used to hold the value to return on 'empty', if it is
86 * 0, should_retry is not set */ 86 * 0, should_retry is not set */
87 87
88BIO_METHOD 88BIO_METHOD *
89*BIO_s_mem(void) 89BIO_s_mem(void)
90{ 90{
91 return (&mem_method); 91 return (&mem_method);
92} 92}
93 93
94BIO 94BIO *
95*BIO_new_mem_buf(void *buf, int len) 95BIO_new_mem_buf(void *buf, int len)
96{ 96{
97 BIO *ret; 97 BIO *ret;
98 BUF_MEM *b; 98 BUF_MEM *b;
diff --git a/src/lib/libssl/src/crypto/bio/bss_null.c b/src/lib/libssl/src/crypto/bio/bss_null.c
index 51aed2ac4b..c7289725d9 100644
--- a/src/lib/libssl/src/crypto/bio/bss_null.c
+++ b/src/lib/libssl/src/crypto/bio/bss_null.c
@@ -82,8 +82,8 @@ static BIO_METHOD null_method = {
82 NULL, 82 NULL,
83}; 83};
84 84
85BIO_METHOD 85BIO_METHOD *
86*BIO_s_null(void) 86BIO_s_null(void)
87{ 87{
88 return (&null_method); 88 return (&null_method);
89} 89}
diff --git a/src/lib/libssl/src/crypto/bio/bss_sock.c b/src/lib/libssl/src/crypto/bio/bss_sock.c
index b9cf817a0c..5335495c6e 100644
--- a/src/lib/libssl/src/crypto/bio/bss_sock.c
+++ b/src/lib/libssl/src/crypto/bio/bss_sock.c
@@ -86,14 +86,14 @@ static BIO_METHOD methods_sockp = {
86 NULL, 86 NULL,
87}; 87};
88 88
89BIO_METHOD 89BIO_METHOD *
90*BIO_s_socket(void) 90BIO_s_socket(void)
91{ 91{
92 return (&methods_sockp); 92 return (&methods_sockp);
93} 93}
94 94
95BIO 95BIO *
96*BIO_new_socket(int fd, int close_flag) 96BIO_new_socket(int fd, int close_flag)
97{ 97{
98 BIO *ret; 98 BIO *ret;
99 99
diff --git a/src/lib/libssl/src/crypto/cryptlib.c b/src/lib/libssl/src/crypto/cryptlib.c
index dc3cc2ab02..ca583d59a9 100644
--- a/src/lib/libssl/src/crypto/cryptlib.c
+++ b/src/lib/libssl/src/crypto/cryptlib.c
@@ -117,10 +117,6 @@
117#include "cryptlib.h" 117#include "cryptlib.h"
118#include <openssl/safestack.h> 118#include <openssl/safestack.h>
119 119
120#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
121static double SSLeay_MSVC5_hack = 0.0; /* and for VC1.5 */
122#endif
123
124DECLARE_STACK_OF(CRYPTO_dynlock) 120DECLARE_STACK_OF(CRYPTO_dynlock)
125 121
126/* real #defines in crypto.h, keep these upto date */ 122/* real #defines in crypto.h, keep these upto date */
@@ -316,8 +312,8 @@ CRYPTO_destroy_dynlockid(int i)
316 } 312 }
317} 313}
318 314
319struct CRYPTO_dynlock_value 315struct CRYPTO_dynlock_value *
320*CRYPTO_get_dynlock_value(int i) 316CRYPTO_get_dynlock_value(int i)
321{ 317{
322 CRYPTO_dynlock *pointer = NULL; 318 CRYPTO_dynlock *pointer = NULL;
323 if (i) 319 if (i)
@@ -337,7 +333,8 @@ struct CRYPTO_dynlock_value
337 return NULL; 333 return NULL;
338} 334}
339 335
340struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))( 336struct CRYPTO_dynlock_value *
337(*CRYPTO_get_dynlock_create_callback(void))(
341 const char *file, int line) 338 const char *file, int line)
342{ 339{
343 return (dynlock_create_callback); 340 return (dynlock_create_callback);
@@ -445,7 +442,7 @@ CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
445 const unsigned char *src = (void *)&id->ptr; 442 const unsigned char *src = (void *)&id->ptr;
446 unsigned char snum = sizeof(id->ptr); 443 unsigned char snum = sizeof(id->ptr);
447 while (snum--) 444 while (snum--)
448 accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; 445 accum += *(src++) * hash_coeffs[(snum + dnum) & 7];
449 accum += dnum; 446 accum += dnum;
450 *(dest++) = accum & 255; 447 *(dest++) = accum & 255;
451 } 448 }
@@ -613,8 +610,8 @@ CRYPTO_add_lock(int *pointer, int amount, int type, const char *file,
613 return (ret); 610 return (ret);
614} 611}
615 612
616const char 613const char *
617*CRYPTO_get_lock_name(int type) 614CRYPTO_get_lock_name(int type)
618{ 615{
619 if (type < 0) 616 if (type < 0)
620 return("dynamic"); 617 return("dynamic");
@@ -631,8 +628,8 @@ const char
631 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) 628 defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64)
632 629
633unsigned int OPENSSL_ia32cap_P[2]; 630unsigned int OPENSSL_ia32cap_P[2];
634unsigned long 631unsigned long *
635*OPENSSL_ia32cap_loc(void) 632OPENSSL_ia32cap_loc(void)
636{ 633{
637 if (sizeof(long) == 4) 634 if (sizeof(long) == 4)
638 /* 635 /*
@@ -646,11 +643,7 @@ unsigned long
646 643
647#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) 644#if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY)
648#define OPENSSL_CPUID_SETUP 645#define OPENSSL_CPUID_SETUP
649#if defined(_WIN32)
650typedef unsigned __int64 IA32CAP;
651#else
652typedef unsigned long long IA32CAP; 646typedef unsigned long long IA32CAP;
653#endif
654void 647void
655OPENSSL_cpuid_setup(void) 648OPENSSL_cpuid_setup(void)
656{ 649{
@@ -665,11 +658,8 @@ OPENSSL_cpuid_setup(void)
665 trigger = 1; 658 trigger = 1;
666 if ((env = getenv("OPENSSL_ia32cap"))) { 659 if ((env = getenv("OPENSSL_ia32cap"))) {
667 int off = (env[0]=='~') ? 1 : 0; 660 int off = (env[0]=='~') ? 1 : 0;
668#if defined(_WIN32) 661 if (!sscanf(env+off, "%lli",(long long *)&vec))
669 if (!sscanf(env+off, "%I64i", &vec)) vec = strtoul(env+off, NULL, 0); 662 vec = strtoul(env+off, NULL, 0);
670#else
671 if (!sscanf(env+off, "%lli",(long long *)&vec)) vec = strtoul(env+off, NULL, 0);
672#endif
673 if (off) 663 if (off)
674 vec = OPENSSL_ia32_cpuid()&~vec; 664 vec = OPENSSL_ia32_cpuid()&~vec;
675 } else 665 } else
@@ -690,13 +680,17 @@ OPENSSL_cpuid_setup(void)
690} 680}
691#endif 681#endif
692int OPENSSL_NONPIC_relocated = 0; 682int OPENSSL_NONPIC_relocated = 0;
683
693#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) 684#if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ)
694void 685void
695OPENSSL_cpuid_setup(void) {} 686OPENSSL_cpuid_setup(void)
687{
688}
696#endif 689#endif
697 690
698 691
699void OPENSSL_showfatal(const char *fmta, ...) 692void
693OPENSSL_showfatal(const char *fmta, ...)
700{ 694{
701 va_list ap; 695 va_list ap;
702 696
@@ -705,7 +699,8 @@ void OPENSSL_showfatal(const char *fmta, ...)
705 va_end (ap); 699 va_end (ap);
706} 700}
707 701
708int OPENSSL_isservice(void) 702int
703OPENSSL_isservice(void)
709{ 704{
710 return 0; 705 return 0;
711} 706}
@@ -719,7 +714,8 @@ OpenSSLDie(const char *file, int line, const char *assertion)
719 abort(); 714 abort();
720} 715}
721 716
722void *OPENSSL_stderr(void) 717void *
718OPENSSL_stderr(void)
723{ 719{
724 return stderr; 720 return stderr;
725} 721}
diff --git a/src/lib/libssl/src/crypto/cversion.c b/src/lib/libssl/src/crypto/cversion.c
index 74317e2e14..7ecfaf9f2f 100644
--- a/src/lib/libssl/src/crypto/cversion.c
+++ b/src/lib/libssl/src/crypto/cversion.c
@@ -58,8 +58,8 @@
58 58
59#include "cryptlib.h" 59#include "cryptlib.h"
60 60
61const char 61const char *
62*SSLeay_version(int t) 62SSLeay_version(int t)
63{ 63{
64 if (t == SSLEAY_VERSION) 64 if (t == SSLEAY_VERSION)
65 return OPENSSL_VERSION_TEXT; 65 return OPENSSL_VERSION_TEXT;
diff --git a/src/lib/libssl/src/crypto/ex_data.c b/src/lib/libssl/src/crypto/ex_data.c
index 4c09f9ee02..0b27d57b45 100644
--- a/src/lib/libssl/src/crypto/ex_data.c
+++ b/src/lib/libssl/src/crypto/ex_data.c
@@ -211,8 +211,8 @@ impl_check(void)
211#define IMPL_CHECK if(!impl) impl_check(); 211#define IMPL_CHECK if(!impl) impl_check();
212 212
213/* API functions to get/set the "ex_data" implementation */ 213/* API functions to get/set the "ex_data" implementation */
214const CRYPTO_EX_DATA_IMPL 214const CRYPTO_EX_DATA_IMPL *
215*CRYPTO_get_ex_data_implementation(void) 215CRYPTO_get_ex_data_implementation(void)
216{ 216{
217 IMPL_CHECK 217 IMPL_CHECK
218 return impl; 218 return impl;
@@ -306,8 +306,8 @@ def_cleanup_cb(void *a_void)
306 306
307/* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a 307/* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a
308 * given class. Handles locking. */ 308 * given class. Handles locking. */
309static EX_CLASS_ITEM 309static EX_CLASS_ITEM *
310*def_get_class(int class_index) 310def_get_class(int class_index)
311{ 311{
312 EX_CLASS_ITEM d, *p, *gen; 312 EX_CLASS_ITEM d, *p, *gen;
313 EX_DATA_CHECK(return NULL;) 313 EX_DATA_CHECK(return NULL;)
@@ -622,8 +622,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val)
622 622
623/* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a 623/* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a
624 * particular index in the class used by this variable */ 624 * particular index in the class used by this variable */
625void 625void *
626*CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) 626CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx)
627{ 627{
628 if (ad->sk == NULL) 628 if (ad->sk == NULL)
629 return (0); 629 return (0);
diff --git a/src/lib/libssl/src/crypto/x509/by_dir.c b/src/lib/libssl/src/crypto/x509/by_dir.c
index 3b72fd302f..76f8244f36 100644
--- a/src/lib/libssl/src/crypto/x509/by_dir.c
+++ b/src/lib/libssl/src/crypto/x509/by_dir.c
@@ -113,8 +113,8 @@ X509_LOOKUP_METHOD x509_dir_lookup = {
113 NULL, /* get_by_alias */ 113 NULL, /* get_by_alias */
114}; 114};
115 115
116X509_LOOKUP_METHOD 116X509_LOOKUP_METHOD *
117*X509_LOOKUP_hash_dir(void) 117X509_LOOKUP_hash_dir(void)
118{ 118{
119 return (&x509_dir_lookup); 119 return (&x509_dir_lookup);
120} 120}
diff --git a/src/lib/libssl/src/crypto/x509/by_file.c b/src/lib/libssl/src/crypto/x509/by_file.c
index 474d13bf0e..93c951ee2a 100644
--- a/src/lib/libssl/src/crypto/x509/by_file.c
+++ b/src/lib/libssl/src/crypto/x509/by_file.c
@@ -84,8 +84,8 @@ X509_LOOKUP_METHOD x509_file_lookup = {
84 NULL, /* get_by_alias */ 84 NULL, /* get_by_alias */
85}; 85};
86 86
87X509_LOOKUP_METHOD 87X509_LOOKUP_METHOD *
88*X509_LOOKUP_file(void) 88X509_LOOKUP_file(void)
89{ 89{
90 return (&x509_file_lookup); 90 return (&x509_file_lookup);
91} 91}
diff --git a/src/lib/libssl/src/crypto/x509/x_all.c b/src/lib/libssl/src/crypto/x509/x_all.c
index 59099f026f..2edec16022 100644
--- a/src/lib/libssl/src/crypto/x509/x_all.c
+++ b/src/lib/libssl/src/crypto/x509/x_all.c
@@ -147,8 +147,8 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md)
147} 147}
148 148
149#ifndef OPENSSL_NO_FP_API 149#ifndef OPENSSL_NO_FP_API
150X509 150X509 *
151*d2i_X509_fp(FILE *fp, X509 **x509) 151d2i_X509_fp(FILE *fp, X509 **x509)
152{ 152{
153 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509); 153 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509);
154} 154}
@@ -160,8 +160,8 @@ i2d_X509_fp(FILE *fp, X509 *x509)
160} 160}
161#endif 161#endif
162 162
163X509 163X509 *
164*d2i_X509_bio(BIO *bp, X509 **x509) 164d2i_X509_bio(BIO *bp, X509 **x509)
165{ 165{
166 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509); 166 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509);
167} 167}
@@ -173,8 +173,8 @@ i2d_X509_bio(BIO *bp, X509 *x509)
173} 173}
174 174
175#ifndef OPENSSL_NO_FP_API 175#ifndef OPENSSL_NO_FP_API
176X509_CRL 176X509_CRL *
177*d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) 177d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl)
178{ 178{
179 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); 179 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl);
180} 180}
@@ -186,8 +186,8 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl)
186} 186}
187#endif 187#endif
188 188
189X509_CRL 189X509_CRL *
190*d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) 190d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl)
191{ 191{
192 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); 192 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl);
193} 193}
@@ -199,8 +199,8 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl)
199} 199}
200 200
201#ifndef OPENSSL_NO_FP_API 201#ifndef OPENSSL_NO_FP_API
202PKCS7 202PKCS7 *
203*d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) 203d2i_PKCS7_fp(FILE *fp, PKCS7 **p7)
204{ 204{
205 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); 205 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7);
206} 206}
@@ -212,8 +212,8 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7)
212} 212}
213#endif 213#endif
214 214
215PKCS7 215PKCS7 *
216*d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) 216d2i_PKCS7_bio(BIO *bp, PKCS7 **p7)
217{ 217{
218 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); 218 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7);
219} 219}
@@ -225,8 +225,8 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7)
225} 225}
226 226
227#ifndef OPENSSL_NO_FP_API 227#ifndef OPENSSL_NO_FP_API
228X509_REQ 228X509_REQ *
229*d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) 229d2i_X509_REQ_fp(FILE *fp, X509_REQ **req)
230{ 230{
231 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); 231 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req);
232} 232}
@@ -238,8 +238,8 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req)
238} 238}
239#endif 239#endif
240 240
241X509_REQ 241X509_REQ *
242*d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) 242d2i_X509_REQ_bio(BIO *bp, X509_REQ **req)
243{ 243{
244 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); 244 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req);
245} 245}
@@ -253,8 +253,8 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req)
253#ifndef OPENSSL_NO_RSA 253#ifndef OPENSSL_NO_RSA
254 254
255#ifndef OPENSSL_NO_FP_API 255#ifndef OPENSSL_NO_FP_API
256RSA 256RSA *
257*d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) 257d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa)
258{ 258{
259 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); 259 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa);
260} 260}
@@ -265,15 +265,15 @@ i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa)
265 return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); 265 return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa);
266} 266}
267 267
268RSA 268RSA *
269*d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) 269d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa)
270{ 270{
271 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); 271 return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa);
272} 272}
273 273
274 274
275RSA 275RSA *
276*d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) 276d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa)
277{ 277{
278 return ASN1_d2i_fp((void *(*)(void))RSA_new, 278 return ASN1_d2i_fp((void *(*)(void))RSA_new,
279 (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa); 279 (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa);
@@ -292,8 +292,8 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa)
292} 292}
293#endif 293#endif
294 294
295RSA 295RSA *
296*d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) 296d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa)
297{ 297{
298 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); 298 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa);
299} 299}
@@ -304,15 +304,15 @@ i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa)
304 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); 304 return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa);
305} 305}
306 306
307RSA 307RSA *
308*d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) 308d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa)
309{ 309{
310 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); 310 return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa);
311} 311}
312 312
313 313
314RSA 314RSA *
315*d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) 315d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa)
316{ 316{
317 return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa); 317 return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa);
318} 318}
@@ -332,8 +332,8 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa)
332 332
333#ifndef OPENSSL_NO_DSA 333#ifndef OPENSSL_NO_DSA
334#ifndef OPENSSL_NO_FP_API 334#ifndef OPENSSL_NO_FP_API
335DSA 335DSA *
336*d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) 336d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa)
337{ 337{
338 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa); 338 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa);
339} 339}
@@ -344,8 +344,8 @@ i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa)
344 return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa); 344 return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa);
345} 345}
346 346
347DSA 347DSA *
348*d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) 348d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa)
349{ 349{
350 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa); 350 return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa);
351} 351}
@@ -357,8 +357,8 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa)
357} 357}
358#endif 358#endif
359 359
360DSA 360DSA *
361*d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) 361d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa)
362{ 362{
363 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa); 363 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa);
364} 364}
@@ -369,8 +369,8 @@ i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa)
369 return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa); 369 return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa);
370} 370}
371 371
372DSA 372DSA *
373*d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) 373d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa)
374{ 374{
375 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa); 375 return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa);
376} 376}
@@ -385,8 +385,8 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa)
385 385
386#ifndef OPENSSL_NO_EC 386#ifndef OPENSSL_NO_EC
387#ifndef OPENSSL_NO_FP_API 387#ifndef OPENSSL_NO_FP_API
388EC_KEY 388EC_KEY *
389*d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) 389d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey)
390{ 390{
391 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey); 391 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey);
392} 392}
@@ -397,8 +397,8 @@ i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey)
397 return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey); 397 return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey);
398} 398}
399 399
400EC_KEY 400EC_KEY *
401*d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) 401d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey)
402{ 402{
403 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); 403 return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey);
404} 404}
@@ -409,8 +409,8 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey)
409 return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); 409 return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey);
410} 410}
411#endif 411#endif
412EC_KEY 412EC_KEY *
413*d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) 413d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey)
414{ 414{
415 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey); 415 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey);
416} 416}
@@ -421,8 +421,8 @@ i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *ecdsa)
421 return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa); 421 return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa);
422} 422}
423 423
424EC_KEY 424EC_KEY *
425*d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) 425d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey)
426{ 426{
427 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); 427 return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey);
428} 428}
@@ -488,8 +488,8 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data,
488 488
489 489
490#ifndef OPENSSL_NO_FP_API 490#ifndef OPENSSL_NO_FP_API
491X509_SIG 491X509_SIG *
492*d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) 492d2i_PKCS8_fp(FILE *fp, X509_SIG **p8)
493{ 493{
494 return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8); 494 return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8);
495} 495}
@@ -501,8 +501,8 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8)
501} 501}
502#endif 502#endif
503 503
504X509_SIG 504X509_SIG *
505*d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) 505d2i_PKCS8_bio(BIO *bp, X509_SIG **p8)
506{ 506{
507 return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8); 507 return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8);
508} 508}
@@ -514,8 +514,8 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8)
514} 514}
515 515
516#ifndef OPENSSL_NO_FP_API 516#ifndef OPENSSL_NO_FP_API
517PKCS8_PRIV_KEY_INFO 517PKCS8_PRIV_KEY_INFO *
518*d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, 518d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp,
519PKCS8_PRIV_KEY_INFO **p8inf) 519PKCS8_PRIV_KEY_INFO **p8inf)
520{ 520{
521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 521 return ASN1_d2i_fp_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
@@ -548,8 +548,8 @@ i2d_PrivateKey_fp(FILE *fp, EVP_PKEY *pkey)
548 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); 548 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey);
549} 549}
550 550
551EVP_PKEY 551EVP_PKEY *
552*d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) 552d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a)
553{ 553{
554 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, 554 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey,
555 fp, a); 555 fp, a);
@@ -561,16 +561,16 @@ i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey)
561 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey); 561 return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey);
562} 562}
563 563
564EVP_PKEY 564EVP_PKEY *
565*d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) 565d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a)
566{ 566{
567 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a); 567 return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a);
568} 568}
569 569
570#endif 570#endif
571 571
572PKCS8_PRIV_KEY_INFO 572PKCS8_PRIV_KEY_INFO *
573*d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, 573d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp,
574PKCS8_PRIV_KEY_INFO **p8inf) 574PKCS8_PRIV_KEY_INFO **p8inf)
575{ 575{
576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new, 576 return ASN1_d2i_bio_of(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_new,
@@ -603,8 +603,8 @@ i2d_PrivateKey_bio(BIO *bp, EVP_PKEY *pkey)
603 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); 603 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey);
604} 604}
605 605
606EVP_PKEY 606EVP_PKEY *
607*d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) 607d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a)
608{ 608{
609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a); 609 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a);
610} 610}
@@ -615,8 +615,8 @@ i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey)
615 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey); 615 return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey);
616} 616}
617 617
618EVP_PKEY 618EVP_PKEY *
619*d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) 619d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a)
620{ 620{
621 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a); 621 return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a);
622} 622}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-22 18:07:08 +0000