From ae7f143bab2f078a032f9dc4fad87f6ac0ba1346 Mon Sep 17 00:00:00 2001 From: deraadt Date: Thu, 17 Apr 2014 17:50:44 +0000 Subject: [PATCH] some KNF cleanup following the script --- lib/libcrypto/aes/aes_misc.c | 5 +- lib/libcrypto/bio/bf_buff.c | 4 +- lib/libcrypto/bio/bf_lbuf.c | 4 +- lib/libcrypto/bio/bf_nbio.c | 4 +- lib/libcrypto/bio/bf_null.c | 4 +- lib/libcrypto/bio/bio_lib.c | 36 ++++---- lib/libcrypto/bio/bss_acpt.c | 12 +-- lib/libcrypto/bio/bss_bio.c | 4 +- lib/libcrypto/bio/bss_conn.c | 12 +-- lib/libcrypto/bio/bss_dgram.c | 16 ++-- lib/libcrypto/bio/bss_fd.c | 8 +- lib/libcrypto/bio/bss_file.c | 12 +-- lib/libcrypto/bio/bss_log.c | 4 +- lib/libcrypto/bio/bss_mem.c | 8 +- lib/libcrypto/bio/bss_null.c | 4 +- lib/libcrypto/bio/bss_sock.c | 8 +- lib/libcrypto/cryptlib.c | 46 +++++----- lib/libcrypto/cversion.c | 4 +- lib/libcrypto/ex_data.c | 12 +-- lib/libcrypto/x509/by_dir.c | 4 +- lib/libcrypto/x509/by_file.c | 4 +- lib/libcrypto/x509/x_all.c | 120 +++++++++++++------------- lib/libssl/src/crypto/aes/aes_misc.c | 5 +- lib/libssl/src/crypto/bio/bf_buff.c | 4 +- lib/libssl/src/crypto/bio/bf_lbuf.c | 4 +- lib/libssl/src/crypto/bio/bf_nbio.c | 4 +- lib/libssl/src/crypto/bio/bf_null.c | 4 +- lib/libssl/src/crypto/bio/bio_lib.c | 36 ++++---- lib/libssl/src/crypto/bio/bss_acpt.c | 12 +-- lib/libssl/src/crypto/bio/bss_bio.c | 4 +- lib/libssl/src/crypto/bio/bss_conn.c | 12 +-- lib/libssl/src/crypto/bio/bss_dgram.c | 16 ++-- lib/libssl/src/crypto/bio/bss_fd.c | 8 +- lib/libssl/src/crypto/bio/bss_file.c | 12 +-- lib/libssl/src/crypto/bio/bss_log.c | 4 +- lib/libssl/src/crypto/bio/bss_mem.c | 8 +- lib/libssl/src/crypto/bio/bss_null.c | 4 +- lib/libssl/src/crypto/bio/bss_sock.c | 8 +- lib/libssl/src/crypto/cryptlib.c | 46 +++++----- lib/libssl/src/crypto/cversion.c | 4 +- lib/libssl/src/crypto/ex_data.c | 12 +-- lib/libssl/src/crypto/x509/by_dir.c | 4 +- lib/libssl/src/crypto/x509/by_file.c | 4 +- lib/libssl/src/crypto/x509/x_all.c | 120 +++++++++++++------------- 44 files changed, 332 insertions(+), 338 deletions(-) diff --git a/lib/libcrypto/aes/aes_misc.c b/lib/libcrypto/aes/aes_misc.c index 9380abc46c2..ba2fcd7d80e 100644 --- a/lib/libcrypto/aes/aes_misc.c +++ b/lib/libcrypto/aes/aes_misc.c @@ -56,8 +56,9 @@ const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; -const char -*AES_options(void) { +const char * +AES_options(void) +{ #ifdef FULL_UNROLL return "aes(full)"; #else diff --git a/lib/libcrypto/bio/bf_buff.c b/lib/libcrypto/bio/bf_buff.c index be2ebab1480..7b76e895a41 100644 --- a/lib/libcrypto/bio/bf_buff.c +++ b/lib/libcrypto/bio/bf_buff.c @@ -84,8 +84,8 @@ static BIO_METHOD methods_buffer = { buffer_callback_ctrl, }; -BIO_METHOD -*BIO_f_buffer(void) +BIO_METHOD * +BIO_f_buffer(void) { return (&methods_buffer); } diff --git a/lib/libcrypto/bio/bf_lbuf.c b/lib/libcrypto/bio/bf_lbuf.c index 5020795ded5..e233cbc92ca 100644 --- a/lib/libcrypto/bio/bf_lbuf.c +++ b/lib/libcrypto/bio/bf_lbuf.c @@ -89,8 +89,8 @@ static BIO_METHOD methods_linebuffer = { linebuffer_callback_ctrl, }; -BIO_METHOD -*BIO_f_linebuffer(void) +BIO_METHOD * +BIO_f_linebuffer(void) { return (&methods_linebuffer); } diff --git a/lib/libcrypto/bio/bf_nbio.c b/lib/libcrypto/bio/bf_nbio.c index 200ca706ff6..48c9781700a 100644 --- a/lib/libcrypto/bio/bf_nbio.c +++ b/lib/libcrypto/bio/bf_nbio.c @@ -93,8 +93,8 @@ static BIO_METHOD methods_nbiof = { nbiof_callback_ctrl, }; -BIO_METHOD -*BIO_f_nbio_test(void) +BIO_METHOD * +BIO_f_nbio_test(void) { return (&methods_nbiof); } diff --git a/lib/libcrypto/bio/bf_null.c b/lib/libcrypto/bio/bf_null.c index ada677c91e1..3bba2afe982 100644 --- a/lib/libcrypto/bio/bf_null.c +++ b/lib/libcrypto/bio/bf_null.c @@ -86,8 +86,8 @@ static BIO_METHOD methods_nullf = { nullf_callback_ctrl, }; -BIO_METHOD -*BIO_f_null(void) +BIO_METHOD * +BIO_f_null(void) { return (&methods_nullf); } diff --git a/lib/libcrypto/bio/bio_lib.c b/lib/libcrypto/bio/bio_lib.c index c226d943afc..485374931b0 100644 --- a/lib/libcrypto/bio/bio_lib.c +++ b/lib/libcrypto/bio/bio_lib.c @@ -63,8 +63,8 @@ #include #include -BIO -*BIO_new(BIO_METHOD *method) +BIO * +BIO_new(BIO_METHOD *method) { BIO *ret = NULL; @@ -352,8 +352,8 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg) return (BIO_ctrl(b, cmd, larg, (char *)&i)); } -char -*BIO_ptr_ctrl(BIO *b, int cmd, long larg) +char * +BIO_ptr_ctrl(BIO *b, int cmd, long larg) { char *p = NULL; @@ -435,8 +435,8 @@ BIO_ctrl_wpending(BIO *bio) /* put the 'bio' on the end of b's list of operators */ -BIO -*BIO_push(BIO *b, BIO *bio) +BIO * +BIO_push(BIO *b, BIO *bio) { BIO *lb; @@ -454,8 +454,8 @@ BIO } /* Remove the first and return the rest */ -BIO -*BIO_pop(BIO *b) +BIO * +BIO_pop(BIO *b) { BIO *ret; @@ -475,8 +475,8 @@ BIO return (ret); } -BIO -*BIO_get_retry_BIO(BIO *bio, int *reason) +BIO * +BIO_get_retry_BIO(BIO *bio, int *reason) { BIO *b, *last; @@ -500,8 +500,8 @@ BIO_get_retry_reason(BIO *bio) return (bio->retry_reason); } -BIO -*BIO_find_type(BIO *bio, int type) +BIO * +BIO_find_type(BIO *bio, int type) { int mt, mask; @@ -522,8 +522,8 @@ BIO return (NULL); } -BIO -*BIO_next(BIO *b) +BIO * +BIO_next(BIO *b) { if (!b) return NULL; @@ -547,8 +547,8 @@ BIO_free_all(BIO *bio) } } -BIO -*BIO_dup_chain(BIO *in) +BIO * +BIO_dup_chain(BIO *in) { BIO *ret = NULL, *eoc = NULL, *bio, *new_bio; @@ -611,8 +611,8 @@ BIO_set_ex_data(BIO *bio, int idx, void *data) return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data)); } -void -*BIO_get_ex_data(BIO *bio, int idx) +void * +BIO_get_ex_data(BIO *bio, int idx) { return (CRYPTO_get_ex_data(&(bio->ex_data), idx)); } diff --git a/lib/libcrypto/bio/bss_acpt.c b/lib/libcrypto/bio/bss_acpt.c index 161b5d01f80..a272ada3667 100644 --- a/lib/libcrypto/bio/bss_acpt.c +++ b/lib/libcrypto/bio/bss_acpt.c @@ -110,8 +110,8 @@ static BIO_METHOD methods_acceptp = { NULL, }; -BIO_METHOD -*BIO_s_accept(void) +BIO_METHOD * +BIO_s_accept(void) { return (&methods_acceptp); } @@ -132,8 +132,8 @@ acpt_new(BIO *bi) return (1); } -static BIO_ACCEPT -*BIO_ACCEPT_new(void) +static BIO_ACCEPT * +BIO_ACCEPT_new(void) { BIO_ACCEPT *ret; @@ -443,8 +443,8 @@ acpt_puts(BIO *bp, const char *str) return (ret); } -BIO -*BIO_new_accept(char *str) +BIO * +BIO_new_accept(char *str) { BIO *ret; diff --git a/lib/libcrypto/bio/bss_bio.c b/lib/libcrypto/bio/bss_bio.c index 4d93aba0a4b..33a0709aaf2 100644 --- a/lib/libcrypto/bio/bss_bio.c +++ b/lib/libcrypto/bio/bss_bio.c @@ -116,8 +116,8 @@ static BIO_METHOD methods_biop = { NULL /* no bio_callback_ctrl */ }; -BIO_METHOD -*BIO_s_bio(void) +BIO_METHOD * +BIO_s_bio(void) { return &methods_biop; } diff --git a/lib/libcrypto/bio/bss_conn.c b/lib/libcrypto/bio/bss_conn.c index 78ce2406480..9c5320cafb6 100644 --- a/lib/libcrypto/bio/bss_conn.c +++ b/lib/libcrypto/bio/bss_conn.c @@ -288,8 +288,8 @@ end: return (ret); } -BIO_CONNECT -*BIO_CONNECT_new(void) +BIO_CONNECT * +BIO_CONNECT_new(void) { BIO_CONNECT *ret; @@ -322,8 +322,8 @@ BIO_CONNECT_free(BIO_CONNECT *a) free(a); } -BIO_METHOD -*BIO_s_connect(void) +BIO_METHOD * +BIO_s_connect(void) { return (&methods_connectp); } @@ -592,8 +592,8 @@ conn_puts(BIO *bp, const char *str) return (ret); } -BIO -*BIO_new_connect(char *str) +BIO * +BIO_new_connect(char *str) { BIO *ret; diff --git a/lib/libcrypto/bio/bss_dgram.c b/lib/libcrypto/bio/bss_dgram.c index e0445fc97e5..4c54601abcb 100644 --- a/lib/libcrypto/bio/bss_dgram.c +++ b/lib/libcrypto/bio/bss_dgram.c @@ -187,14 +187,14 @@ typedef struct bio_dgram_sctp_data_st { } bio_dgram_sctp_data; #endif -BIO_METHOD -*BIO_s_datagram(void) +BIO_METHOD * +BIO_s_datagram(void) { return (&methods_dgramp); } -BIO -*BIO_new_dgram(int fd, int close_flag) +BIO * +BIO_new_dgram(int fd, int close_flag) { BIO *ret; @@ -764,14 +764,14 @@ dgram_puts(BIO *bp, const char *str) } #ifndef OPENSSL_NO_SCTP -BIO_METHOD -*BIO_s_datagram_sctp(void) +BIO_METHOD * +BIO_s_datagram_sctp(void) { return (&methods_dgramp_sctp); } -BIO -*BIO_new_dgram_sctp(int fd, int close_flag) +BIO * +BIO_new_dgram_sctp(int fd, int close_flag) { BIO *bio; int ret, optval = 20000; diff --git a/lib/libcrypto/bio/bss_fd.c b/lib/libcrypto/bio/bss_fd.c index 988104e77cb..4369d6411d8 100644 --- a/lib/libcrypto/bio/bss_fd.c +++ b/lib/libcrypto/bio/bss_fd.c @@ -90,14 +90,14 @@ static BIO_METHOD methods_fdp = { NULL, }; -BIO_METHOD -*BIO_s_fd(void) +BIO_METHOD * +BIO_s_fd(void) { return (&methods_fdp); } -BIO -*BIO_new_fd(int fd, int close_flag) +BIO * +BIO_new_fd(int fd, int close_flag) { BIO *ret; ret = BIO_new(BIO_s_fd()); diff --git a/lib/libcrypto/bio/bss_file.c b/lib/libcrypto/bio/bss_file.c index c92c4753aa7..995c6233411 100644 --- a/lib/libcrypto/bio/bss_file.c +++ b/lib/libcrypto/bio/bss_file.c @@ -112,8 +112,8 @@ static BIO_METHOD methods_filep = { NULL, }; -BIO -*BIO_new_file(const char *filename, const char *mode) +BIO * +BIO_new_file(const char *filename, const char *mode) { BIO *ret; FILE *file = NULL; @@ -138,8 +138,8 @@ BIO return (ret); } -BIO -*BIO_new_fp(FILE *stream, int close_flag) +BIO * +BIO_new_fp(FILE *stream, int close_flag) { BIO *ret; @@ -150,8 +150,8 @@ BIO return (ret); } -BIO_METHOD -*BIO_s_file(void) +BIO_METHOD * +BIO_s_file(void) { return (&methods_filep); } diff --git a/lib/libcrypto/bio/bss_log.c b/lib/libcrypto/bio/bss_log.c index cde3c858f14..342176f82ec 100644 --- a/lib/libcrypto/bio/bss_log.c +++ b/lib/libcrypto/bio/bss_log.c @@ -97,8 +97,8 @@ static BIO_METHOD methods_slg = { NULL, }; -BIO_METHOD -*BIO_s_log(void) +BIO_METHOD * +BIO_s_log(void) { return (&methods_slg); } diff --git a/lib/libcrypto/bio/bss_mem.c b/lib/libcrypto/bio/bss_mem.c index a5192202bdf..1a477c12be3 100644 --- a/lib/libcrypto/bio/bss_mem.c +++ b/lib/libcrypto/bio/bss_mem.c @@ -85,14 +85,14 @@ static BIO_METHOD mem_method = { /* bio->num is used to hold the value to return on 'empty', if it is * 0, should_retry is not set */ -BIO_METHOD -*BIO_s_mem(void) +BIO_METHOD * +BIO_s_mem(void) { return (&mem_method); } -BIO -*BIO_new_mem_buf(void *buf, int len) +BIO * +BIO_new_mem_buf(void *buf, int len) { BIO *ret; BUF_MEM *b; diff --git a/lib/libcrypto/bio/bss_null.c b/lib/libcrypto/bio/bss_null.c index 51aed2ac4bd..c7289725d98 100644 --- a/lib/libcrypto/bio/bss_null.c +++ b/lib/libcrypto/bio/bss_null.c @@ -82,8 +82,8 @@ static BIO_METHOD null_method = { NULL, }; -BIO_METHOD -*BIO_s_null(void) +BIO_METHOD * +BIO_s_null(void) { return (&null_method); } diff --git a/lib/libcrypto/bio/bss_sock.c b/lib/libcrypto/bio/bss_sock.c index b9cf817a0c4..5335495c6ef 100644 --- a/lib/libcrypto/bio/bss_sock.c +++ b/lib/libcrypto/bio/bss_sock.c @@ -86,14 +86,14 @@ static BIO_METHOD methods_sockp = { NULL, }; -BIO_METHOD -*BIO_s_socket(void) +BIO_METHOD * +BIO_s_socket(void) { return (&methods_sockp); } -BIO -*BIO_new_socket(int fd, int close_flag) +BIO * +BIO_new_socket(int fd, int close_flag) { BIO *ret; diff --git a/lib/libcrypto/cryptlib.c b/lib/libcrypto/cryptlib.c index dc3cc2ab025..ca583d59a93 100644 --- a/lib/libcrypto/cryptlib.c +++ b/lib/libcrypto/cryptlib.c @@ -117,10 +117,6 @@ #include "cryptlib.h" #include -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) -static double SSLeay_MSVC5_hack = 0.0; /* and for VC1.5 */ -#endif - DECLARE_STACK_OF(CRYPTO_dynlock) /* real #defines in crypto.h, keep these upto date */ @@ -316,8 +312,8 @@ CRYPTO_destroy_dynlockid(int i) } } -struct CRYPTO_dynlock_value -*CRYPTO_get_dynlock_value(int i) +struct CRYPTO_dynlock_value * +CRYPTO_get_dynlock_value(int i) { CRYPTO_dynlock *pointer = NULL; if (i) @@ -337,7 +333,8 @@ struct CRYPTO_dynlock_value return NULL; } -struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))( +struct CRYPTO_dynlock_value * +(*CRYPTO_get_dynlock_create_callback(void))( const char *file, int line) { return (dynlock_create_callback); @@ -445,7 +442,7 @@ CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) const unsigned char *src = (void *)&id->ptr; unsigned char snum = sizeof(id->ptr); while (snum--) - accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; + accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; accum += dnum; *(dest++) = accum & 255; } @@ -613,8 +610,8 @@ CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, return (ret); } -const char -*CRYPTO_get_lock_name(int type) +const char * +CRYPTO_get_lock_name(int type) { if (type < 0) return("dynamic"); @@ -631,8 +628,8 @@ const char defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) unsigned int OPENSSL_ia32cap_P[2]; -unsigned long -*OPENSSL_ia32cap_loc(void) +unsigned long * +OPENSSL_ia32cap_loc(void) { if (sizeof(long) == 4) /* @@ -646,11 +643,7 @@ unsigned long #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) #define OPENSSL_CPUID_SETUP -#if defined(_WIN32) -typedef unsigned __int64 IA32CAP; -#else typedef unsigned long long IA32CAP; -#endif void OPENSSL_cpuid_setup(void) { @@ -665,11 +658,8 @@ OPENSSL_cpuid_setup(void) trigger = 1; if ((env = getenv("OPENSSL_ia32cap"))) { int off = (env[0]=='~') ? 1 : 0; -#if defined(_WIN32) - if (!sscanf(env+off, "%I64i", &vec)) vec = strtoul(env+off, NULL, 0); -#else - if (!sscanf(env+off, "%lli",(long long *)&vec)) vec = strtoul(env+off, NULL, 0); -#endif + if (!sscanf(env+off, "%lli",(long long *)&vec)) + vec = strtoul(env+off, NULL, 0); if (off) vec = OPENSSL_ia32_cpuid()&~vec; } else @@ -690,13 +680,17 @@ OPENSSL_cpuid_setup(void) } #endif int OPENSSL_NONPIC_relocated = 0; + #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void -OPENSSL_cpuid_setup(void) {} +OPENSSL_cpuid_setup(void) +{ +} #endif -void OPENSSL_showfatal(const char *fmta, ...) +void +OPENSSL_showfatal(const char *fmta, ...) { va_list ap; @@ -705,7 +699,8 @@ void OPENSSL_showfatal(const char *fmta, ...) va_end (ap); } -int OPENSSL_isservice(void) +int +OPENSSL_isservice(void) { return 0; } @@ -719,7 +714,8 @@ OpenSSLDie(const char *file, int line, const char *assertion) abort(); } -void *OPENSSL_stderr(void) +void * +OPENSSL_stderr(void) { return stderr; } diff --git a/lib/libcrypto/cversion.c b/lib/libcrypto/cversion.c index 74317e2e147..7ecfaf9f2fe 100644 --- a/lib/libcrypto/cversion.c +++ b/lib/libcrypto/cversion.c @@ -58,8 +58,8 @@ #include "cryptlib.h" -const char -*SSLeay_version(int t) +const char * +SSLeay_version(int t) { if (t == SSLEAY_VERSION) return OPENSSL_VERSION_TEXT; diff --git a/lib/libcrypto/ex_data.c b/lib/libcrypto/ex_data.c index 4c09f9ee020..0b27d57b45b 100644 --- a/lib/libcrypto/ex_data.c +++ b/lib/libcrypto/ex_data.c @@ -211,8 +211,8 @@ impl_check(void) #define IMPL_CHECK if(!impl) impl_check(); /* API functions to get/set the "ex_data" implementation */ -const CRYPTO_EX_DATA_IMPL -*CRYPTO_get_ex_data_implementation(void) +const CRYPTO_EX_DATA_IMPL * +CRYPTO_get_ex_data_implementation(void) { IMPL_CHECK return impl; @@ -306,8 +306,8 @@ def_cleanup_cb(void *a_void) /* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a * given class. Handles locking. */ -static EX_CLASS_ITEM -*def_get_class(int class_index) +static EX_CLASS_ITEM * +def_get_class(int class_index) { EX_CLASS_ITEM d, *p, *gen; EX_DATA_CHECK(return NULL;) @@ -622,8 +622,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val) /* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a * particular index in the class used by this variable */ -void -*CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) +void * +CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) { if (ad->sk == NULL) return (0); diff --git a/lib/libcrypto/x509/by_dir.c b/lib/libcrypto/x509/by_dir.c index 3b72fd302fd..76f8244f364 100644 --- a/lib/libcrypto/x509/by_dir.c +++ b/lib/libcrypto/x509/by_dir.c @@ -113,8 +113,8 @@ X509_LOOKUP_METHOD x509_dir_lookup = { NULL, /* get_by_alias */ }; -X509_LOOKUP_METHOD -*X509_LOOKUP_hash_dir(void) +X509_LOOKUP_METHOD * +X509_LOOKUP_hash_dir(void) { return (&x509_dir_lookup); } diff --git a/lib/libcrypto/x509/by_file.c b/lib/libcrypto/x509/by_file.c index 474d13bf0ec..93c951ee2ad 100644 --- a/lib/libcrypto/x509/by_file.c +++ b/lib/libcrypto/x509/by_file.c @@ -84,8 +84,8 @@ X509_LOOKUP_METHOD x509_file_lookup = { NULL, /* get_by_alias */ }; -X509_LOOKUP_METHOD -*X509_LOOKUP_file(void) +X509_LOOKUP_METHOD * +X509_LOOKUP_file(void) { return (&x509_file_lookup); } diff --git a/lib/libcrypto/x509/x_all.c b/lib/libcrypto/x509/x_all.c index 59099f026f8..2edec160228 100644 --- a/lib/libcrypto/x509/x_all.c +++ b/lib/libcrypto/x509/x_all.c @@ -147,8 +147,8 @@ NETSCAPE_SPKI_sign(NETSCAPE_SPKI *x, EVP_PKEY *pkey, const EVP_MD *md) } #ifndef OPENSSL_NO_FP_API -X509 -*d2i_X509_fp(FILE *fp, X509 **x509) +X509 * +d2i_X509_fp(FILE *fp, X509 **x509) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509); } @@ -160,8 +160,8 @@ i2d_X509_fp(FILE *fp, X509 *x509) } #endif -X509 -*d2i_X509_bio(BIO *bp, X509 **x509) +X509 * +d2i_X509_bio(BIO *bp, X509 **x509) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509); } @@ -173,8 +173,8 @@ i2d_X509_bio(BIO *bp, X509 *x509) } #ifndef OPENSSL_NO_FP_API -X509_CRL -*d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) +X509_CRL * +d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); } @@ -186,8 +186,8 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl) } #endif -X509_CRL -*d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) +X509_CRL * +d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); } @@ -199,8 +199,8 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl) } #ifndef OPENSSL_NO_FP_API -PKCS7 -*d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) +PKCS7 * +d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); } @@ -212,8 +212,8 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7) } #endif -PKCS7 -*d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) +PKCS7 * +d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); } @@ -225,8 +225,8 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7) } #ifndef OPENSSL_NO_FP_API -X509_REQ -*d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) +X509_REQ * +d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); } @@ -238,8 +238,8 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req) } #endif -X509_REQ -*d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) +X509_REQ * +d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); } @@ -253,8 +253,8 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req) #ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_FP_API -RSA -*d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) +RSA * +d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); } @@ -265,15 +265,15 @@ i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa) return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); } -RSA -*d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) +RSA * +d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); } -RSA -*d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) +RSA * +d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) { return ASN1_d2i_fp((void *(*)(void))RSA_new, (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa); @@ -292,8 +292,8 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa) } #endif -RSA -*d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) +RSA * +d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); } @@ -304,15 +304,15 @@ i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa) return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); } -RSA -*d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) +RSA * +d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); } -RSA -*d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) +RSA * +d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) { return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa); } @@ -332,8 +332,8 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa) #ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_FP_API -DSA -*d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) +DSA * +d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) { return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa); } @@ -344,8 +344,8 @@ i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa) return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa); } -DSA -*d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) +DSA * +d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) { return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa); } @@ -357,8 +357,8 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa) } #endif -DSA -*d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) +DSA * +d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) { return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa); } @@ -369,8 +369,8 @@ i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa) return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa); } -DSA -*d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) +DSA * +d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) { return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa); } @@ -385,8 +385,8 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa) #ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_FP_API -EC_KEY -*d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) +EC_KEY * +d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) { return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey); } @@ -397,8 +397,8 @@ i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey) return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey); } -EC_KEY -*d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) +EC_KEY * +d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) { return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); } @@ -409,8 +409,8 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey) return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); } #endif -EC_KEY -*d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) +EC_KEY * +d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) { return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey); } @@ -421,8 +421,8 @@ i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *ecdsa) return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa); } -EC_KEY -*d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) +EC_KEY * +d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) { return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); } @@ -488,8 +488,8 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data, #ifndef OPENSSL_NO_FP_API -X509_SIG -*d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) +X509_SIG * +d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) { return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8); } @@ -501,8 +501,8 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8) } #endif -X509_SIG -*d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) +X509_SIG * +d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) { return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8); } @@ -514,8 +514,8 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8) } #ifndef OPENSSL_NO_FP_API -PKCS8_PRIV_KEY_INFO -*d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, +PKCS8_PRIV_KEY_INFO * +d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf) { 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) return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); } -EVP_PKEY -*d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) +EVP_PKEY * +d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) { return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, fp, a); @@ -561,16 +561,16 @@ i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey) return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey); } -EVP_PKEY -*d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) +EVP_PKEY * +d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) { return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a); } #endif -PKCS8_PRIV_KEY_INFO -*d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, +PKCS8_PRIV_KEY_INFO * +d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf) { 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) return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); } -EVP_PKEY -*d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) +EVP_PKEY * +d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) { return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a); } @@ -615,8 +615,8 @@ i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey) return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey); } -EVP_PKEY -*d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) +EVP_PKEY * +d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) { return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a); } diff --git a/lib/libssl/src/crypto/aes/aes_misc.c b/lib/libssl/src/crypto/aes/aes_misc.c index 9380abc46c2..ba2fcd7d80e 100644 --- a/lib/libssl/src/crypto/aes/aes_misc.c +++ b/lib/libssl/src/crypto/aes/aes_misc.c @@ -56,8 +56,9 @@ const char AES_version[]="AES" OPENSSL_VERSION_PTEXT; -const char -*AES_options(void) { +const char * +AES_options(void) +{ #ifdef FULL_UNROLL return "aes(full)"; #else diff --git a/lib/libssl/src/crypto/bio/bf_buff.c b/lib/libssl/src/crypto/bio/bf_buff.c index be2ebab1480..7b76e895a41 100644 --- a/lib/libssl/src/crypto/bio/bf_buff.c +++ b/lib/libssl/src/crypto/bio/bf_buff.c @@ -84,8 +84,8 @@ static BIO_METHOD methods_buffer = { buffer_callback_ctrl, }; -BIO_METHOD -*BIO_f_buffer(void) +BIO_METHOD * +BIO_f_buffer(void) { return (&methods_buffer); } diff --git a/lib/libssl/src/crypto/bio/bf_lbuf.c b/lib/libssl/src/crypto/bio/bf_lbuf.c index 5020795ded5..e233cbc92ca 100644 --- a/lib/libssl/src/crypto/bio/bf_lbuf.c +++ b/lib/libssl/src/crypto/bio/bf_lbuf.c @@ -89,8 +89,8 @@ static BIO_METHOD methods_linebuffer = { linebuffer_callback_ctrl, }; -BIO_METHOD -*BIO_f_linebuffer(void) +BIO_METHOD * +BIO_f_linebuffer(void) { return (&methods_linebuffer); } diff --git a/lib/libssl/src/crypto/bio/bf_nbio.c b/lib/libssl/src/crypto/bio/bf_nbio.c index 200ca706ff6..48c9781700a 100644 --- a/lib/libssl/src/crypto/bio/bf_nbio.c +++ b/lib/libssl/src/crypto/bio/bf_nbio.c @@ -93,8 +93,8 @@ static BIO_METHOD methods_nbiof = { nbiof_callback_ctrl, }; -BIO_METHOD -*BIO_f_nbio_test(void) +BIO_METHOD * +BIO_f_nbio_test(void) { return (&methods_nbiof); } diff --git a/lib/libssl/src/crypto/bio/bf_null.c b/lib/libssl/src/crypto/bio/bf_null.c index ada677c91e1..3bba2afe982 100644 --- a/lib/libssl/src/crypto/bio/bf_null.c +++ b/lib/libssl/src/crypto/bio/bf_null.c @@ -86,8 +86,8 @@ static BIO_METHOD methods_nullf = { nullf_callback_ctrl, }; -BIO_METHOD -*BIO_f_null(void) +BIO_METHOD * +BIO_f_null(void) { return (&methods_nullf); } diff --git a/lib/libssl/src/crypto/bio/bio_lib.c b/lib/libssl/src/crypto/bio/bio_lib.c index c226d943afc..485374931b0 100644 --- a/lib/libssl/src/crypto/bio/bio_lib.c +++ b/lib/libssl/src/crypto/bio/bio_lib.c @@ -63,8 +63,8 @@ #include #include -BIO -*BIO_new(BIO_METHOD *method) +BIO * +BIO_new(BIO_METHOD *method) { BIO *ret = NULL; @@ -352,8 +352,8 @@ BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg) return (BIO_ctrl(b, cmd, larg, (char *)&i)); } -char -*BIO_ptr_ctrl(BIO *b, int cmd, long larg) +char * +BIO_ptr_ctrl(BIO *b, int cmd, long larg) { char *p = NULL; @@ -435,8 +435,8 @@ BIO_ctrl_wpending(BIO *bio) /* put the 'bio' on the end of b's list of operators */ -BIO -*BIO_push(BIO *b, BIO *bio) +BIO * +BIO_push(BIO *b, BIO *bio) { BIO *lb; @@ -454,8 +454,8 @@ BIO } /* Remove the first and return the rest */ -BIO -*BIO_pop(BIO *b) +BIO * +BIO_pop(BIO *b) { BIO *ret; @@ -475,8 +475,8 @@ BIO return (ret); } -BIO -*BIO_get_retry_BIO(BIO *bio, int *reason) +BIO * +BIO_get_retry_BIO(BIO *bio, int *reason) { BIO *b, *last; @@ -500,8 +500,8 @@ BIO_get_retry_reason(BIO *bio) return (bio->retry_reason); } -BIO -*BIO_find_type(BIO *bio, int type) +BIO * +BIO_find_type(BIO *bio, int type) { int mt, mask; @@ -522,8 +522,8 @@ BIO return (NULL); } -BIO -*BIO_next(BIO *b) +BIO * +BIO_next(BIO *b) { if (!b) return NULL; @@ -547,8 +547,8 @@ BIO_free_all(BIO *bio) } } -BIO -*BIO_dup_chain(BIO *in) +BIO * +BIO_dup_chain(BIO *in) { BIO *ret = NULL, *eoc = NULL, *bio, *new_bio; @@ -611,8 +611,8 @@ BIO_set_ex_data(BIO *bio, int idx, void *data) return (CRYPTO_set_ex_data(&(bio->ex_data), idx, data)); } -void -*BIO_get_ex_data(BIO *bio, int idx) +void * +BIO_get_ex_data(BIO *bio, int idx) { return (CRYPTO_get_ex_data(&(bio->ex_data), idx)); } diff --git a/lib/libssl/src/crypto/bio/bss_acpt.c b/lib/libssl/src/crypto/bio/bss_acpt.c index 161b5d01f80..a272ada3667 100644 --- a/lib/libssl/src/crypto/bio/bss_acpt.c +++ b/lib/libssl/src/crypto/bio/bss_acpt.c @@ -110,8 +110,8 @@ static BIO_METHOD methods_acceptp = { NULL, }; -BIO_METHOD -*BIO_s_accept(void) +BIO_METHOD * +BIO_s_accept(void) { return (&methods_acceptp); } @@ -132,8 +132,8 @@ acpt_new(BIO *bi) return (1); } -static BIO_ACCEPT -*BIO_ACCEPT_new(void) +static BIO_ACCEPT * +BIO_ACCEPT_new(void) { BIO_ACCEPT *ret; @@ -443,8 +443,8 @@ acpt_puts(BIO *bp, const char *str) return (ret); } -BIO -*BIO_new_accept(char *str) +BIO * +BIO_new_accept(char *str) { BIO *ret; diff --git a/lib/libssl/src/crypto/bio/bss_bio.c b/lib/libssl/src/crypto/bio/bss_bio.c index 4d93aba0a4b..33a0709aaf2 100644 --- a/lib/libssl/src/crypto/bio/bss_bio.c +++ b/lib/libssl/src/crypto/bio/bss_bio.c @@ -116,8 +116,8 @@ static BIO_METHOD methods_biop = { NULL /* no bio_callback_ctrl */ }; -BIO_METHOD -*BIO_s_bio(void) +BIO_METHOD * +BIO_s_bio(void) { return &methods_biop; } diff --git a/lib/libssl/src/crypto/bio/bss_conn.c b/lib/libssl/src/crypto/bio/bss_conn.c index 78ce2406480..9c5320cafb6 100644 --- a/lib/libssl/src/crypto/bio/bss_conn.c +++ b/lib/libssl/src/crypto/bio/bss_conn.c @@ -288,8 +288,8 @@ end: return (ret); } -BIO_CONNECT -*BIO_CONNECT_new(void) +BIO_CONNECT * +BIO_CONNECT_new(void) { BIO_CONNECT *ret; @@ -322,8 +322,8 @@ BIO_CONNECT_free(BIO_CONNECT *a) free(a); } -BIO_METHOD -*BIO_s_connect(void) +BIO_METHOD * +BIO_s_connect(void) { return (&methods_connectp); } @@ -592,8 +592,8 @@ conn_puts(BIO *bp, const char *str) return (ret); } -BIO -*BIO_new_connect(char *str) +BIO * +BIO_new_connect(char *str) { BIO *ret; diff --git a/lib/libssl/src/crypto/bio/bss_dgram.c b/lib/libssl/src/crypto/bio/bss_dgram.c index e0445fc97e5..4c54601abcb 100644 --- a/lib/libssl/src/crypto/bio/bss_dgram.c +++ b/lib/libssl/src/crypto/bio/bss_dgram.c @@ -187,14 +187,14 @@ typedef struct bio_dgram_sctp_data_st { } bio_dgram_sctp_data; #endif -BIO_METHOD -*BIO_s_datagram(void) +BIO_METHOD * +BIO_s_datagram(void) { return (&methods_dgramp); } -BIO -*BIO_new_dgram(int fd, int close_flag) +BIO * +BIO_new_dgram(int fd, int close_flag) { BIO *ret; @@ -764,14 +764,14 @@ dgram_puts(BIO *bp, const char *str) } #ifndef OPENSSL_NO_SCTP -BIO_METHOD -*BIO_s_datagram_sctp(void) +BIO_METHOD * +BIO_s_datagram_sctp(void) { return (&methods_dgramp_sctp); } -BIO -*BIO_new_dgram_sctp(int fd, int close_flag) +BIO * +BIO_new_dgram_sctp(int fd, int close_flag) { BIO *bio; int ret, optval = 20000; diff --git a/lib/libssl/src/crypto/bio/bss_fd.c b/lib/libssl/src/crypto/bio/bss_fd.c index 988104e77cb..4369d6411d8 100644 --- a/lib/libssl/src/crypto/bio/bss_fd.c +++ b/lib/libssl/src/crypto/bio/bss_fd.c @@ -90,14 +90,14 @@ static BIO_METHOD methods_fdp = { NULL, }; -BIO_METHOD -*BIO_s_fd(void) +BIO_METHOD * +BIO_s_fd(void) { return (&methods_fdp); } -BIO -*BIO_new_fd(int fd, int close_flag) +BIO * +BIO_new_fd(int fd, int close_flag) { BIO *ret; ret = BIO_new(BIO_s_fd()); diff --git a/lib/libssl/src/crypto/bio/bss_file.c b/lib/libssl/src/crypto/bio/bss_file.c index c92c4753aa7..995c6233411 100644 --- a/lib/libssl/src/crypto/bio/bss_file.c +++ b/lib/libssl/src/crypto/bio/bss_file.c @@ -112,8 +112,8 @@ static BIO_METHOD methods_filep = { NULL, }; -BIO -*BIO_new_file(const char *filename, const char *mode) +BIO * +BIO_new_file(const char *filename, const char *mode) { BIO *ret; FILE *file = NULL; @@ -138,8 +138,8 @@ BIO return (ret); } -BIO -*BIO_new_fp(FILE *stream, int close_flag) +BIO * +BIO_new_fp(FILE *stream, int close_flag) { BIO *ret; @@ -150,8 +150,8 @@ BIO return (ret); } -BIO_METHOD -*BIO_s_file(void) +BIO_METHOD * +BIO_s_file(void) { return (&methods_filep); } diff --git a/lib/libssl/src/crypto/bio/bss_log.c b/lib/libssl/src/crypto/bio/bss_log.c index cde3c858f14..342176f82ec 100644 --- a/lib/libssl/src/crypto/bio/bss_log.c +++ b/lib/libssl/src/crypto/bio/bss_log.c @@ -97,8 +97,8 @@ static BIO_METHOD methods_slg = { NULL, }; -BIO_METHOD -*BIO_s_log(void) +BIO_METHOD * +BIO_s_log(void) { return (&methods_slg); } diff --git a/lib/libssl/src/crypto/bio/bss_mem.c b/lib/libssl/src/crypto/bio/bss_mem.c index a5192202bdf..1a477c12be3 100644 --- a/lib/libssl/src/crypto/bio/bss_mem.c +++ b/lib/libssl/src/crypto/bio/bss_mem.c @@ -85,14 +85,14 @@ static BIO_METHOD mem_method = { /* bio->num is used to hold the value to return on 'empty', if it is * 0, should_retry is not set */ -BIO_METHOD -*BIO_s_mem(void) +BIO_METHOD * +BIO_s_mem(void) { return (&mem_method); } -BIO -*BIO_new_mem_buf(void *buf, int len) +BIO * +BIO_new_mem_buf(void *buf, int len) { BIO *ret; BUF_MEM *b; diff --git a/lib/libssl/src/crypto/bio/bss_null.c b/lib/libssl/src/crypto/bio/bss_null.c index 51aed2ac4bd..c7289725d98 100644 --- a/lib/libssl/src/crypto/bio/bss_null.c +++ b/lib/libssl/src/crypto/bio/bss_null.c @@ -82,8 +82,8 @@ static BIO_METHOD null_method = { NULL, }; -BIO_METHOD -*BIO_s_null(void) +BIO_METHOD * +BIO_s_null(void) { return (&null_method); } diff --git a/lib/libssl/src/crypto/bio/bss_sock.c b/lib/libssl/src/crypto/bio/bss_sock.c index b9cf817a0c4..5335495c6ef 100644 --- a/lib/libssl/src/crypto/bio/bss_sock.c +++ b/lib/libssl/src/crypto/bio/bss_sock.c @@ -86,14 +86,14 @@ static BIO_METHOD methods_sockp = { NULL, }; -BIO_METHOD -*BIO_s_socket(void) +BIO_METHOD * +BIO_s_socket(void) { return (&methods_sockp); } -BIO -*BIO_new_socket(int fd, int close_flag) +BIO * +BIO_new_socket(int fd, int close_flag) { BIO *ret; diff --git a/lib/libssl/src/crypto/cryptlib.c b/lib/libssl/src/crypto/cryptlib.c index dc3cc2ab025..ca583d59a93 100644 --- a/lib/libssl/src/crypto/cryptlib.c +++ b/lib/libssl/src/crypto/cryptlib.c @@ -117,10 +117,6 @@ #include "cryptlib.h" #include -#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) -static double SSLeay_MSVC5_hack = 0.0; /* and for VC1.5 */ -#endif - DECLARE_STACK_OF(CRYPTO_dynlock) /* real #defines in crypto.h, keep these upto date */ @@ -316,8 +312,8 @@ CRYPTO_destroy_dynlockid(int i) } } -struct CRYPTO_dynlock_value -*CRYPTO_get_dynlock_value(int i) +struct CRYPTO_dynlock_value * +CRYPTO_get_dynlock_value(int i) { CRYPTO_dynlock *pointer = NULL; if (i) @@ -337,7 +333,8 @@ struct CRYPTO_dynlock_value return NULL; } -struct CRYPTO_dynlock_value *(*CRYPTO_get_dynlock_create_callback(void))( +struct CRYPTO_dynlock_value * +(*CRYPTO_get_dynlock_create_callback(void))( const char *file, int line) { return (dynlock_create_callback); @@ -445,7 +442,7 @@ CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr) const unsigned char *src = (void *)&id->ptr; unsigned char snum = sizeof(id->ptr); while (snum--) - accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; + accum += *(src++) * hash_coeffs[(snum + dnum) & 7]; accum += dnum; *(dest++) = accum & 255; } @@ -613,8 +610,8 @@ CRYPTO_add_lock(int *pointer, int amount, int type, const char *file, return (ret); } -const char -*CRYPTO_get_lock_name(int type) +const char * +CRYPTO_get_lock_name(int type) { if (type < 0) return("dynamic"); @@ -631,8 +628,8 @@ const char defined(__x86_64) || defined(__x86_64__) || defined(_M_AMD64) || defined(_M_X64) unsigned int OPENSSL_ia32cap_P[2]; -unsigned long -*OPENSSL_ia32cap_loc(void) +unsigned long * +OPENSSL_ia32cap_loc(void) { if (sizeof(long) == 4) /* @@ -646,11 +643,7 @@ unsigned long #if defined(OPENSSL_CPUID_OBJ) && !defined(OPENSSL_NO_ASM) && !defined(I386_ONLY) #define OPENSSL_CPUID_SETUP -#if defined(_WIN32) -typedef unsigned __int64 IA32CAP; -#else typedef unsigned long long IA32CAP; -#endif void OPENSSL_cpuid_setup(void) { @@ -665,11 +658,8 @@ OPENSSL_cpuid_setup(void) trigger = 1; if ((env = getenv("OPENSSL_ia32cap"))) { int off = (env[0]=='~') ? 1 : 0; -#if defined(_WIN32) - if (!sscanf(env+off, "%I64i", &vec)) vec = strtoul(env+off, NULL, 0); -#else - if (!sscanf(env+off, "%lli",(long long *)&vec)) vec = strtoul(env+off, NULL, 0); -#endif + if (!sscanf(env+off, "%lli",(long long *)&vec)) + vec = strtoul(env+off, NULL, 0); if (off) vec = OPENSSL_ia32_cpuid()&~vec; } else @@ -690,13 +680,17 @@ OPENSSL_cpuid_setup(void) } #endif int OPENSSL_NONPIC_relocated = 0; + #if !defined(OPENSSL_CPUID_SETUP) && !defined(OPENSSL_CPUID_OBJ) void -OPENSSL_cpuid_setup(void) {} +OPENSSL_cpuid_setup(void) +{ +} #endif -void OPENSSL_showfatal(const char *fmta, ...) +void +OPENSSL_showfatal(const char *fmta, ...) { va_list ap; @@ -705,7 +699,8 @@ void OPENSSL_showfatal(const char *fmta, ...) va_end (ap); } -int OPENSSL_isservice(void) +int +OPENSSL_isservice(void) { return 0; } @@ -719,7 +714,8 @@ OpenSSLDie(const char *file, int line, const char *assertion) abort(); } -void *OPENSSL_stderr(void) +void * +OPENSSL_stderr(void) { return stderr; } diff --git a/lib/libssl/src/crypto/cversion.c b/lib/libssl/src/crypto/cversion.c index 74317e2e147..7ecfaf9f2fe 100644 --- a/lib/libssl/src/crypto/cversion.c +++ b/lib/libssl/src/crypto/cversion.c @@ -58,8 +58,8 @@ #include "cryptlib.h" -const char -*SSLeay_version(int t) +const char * +SSLeay_version(int t) { if (t == SSLEAY_VERSION) return OPENSSL_VERSION_TEXT; diff --git a/lib/libssl/src/crypto/ex_data.c b/lib/libssl/src/crypto/ex_data.c index 4c09f9ee020..0b27d57b45b 100644 --- a/lib/libssl/src/crypto/ex_data.c +++ b/lib/libssl/src/crypto/ex_data.c @@ -211,8 +211,8 @@ impl_check(void) #define IMPL_CHECK if(!impl) impl_check(); /* API functions to get/set the "ex_data" implementation */ -const CRYPTO_EX_DATA_IMPL -*CRYPTO_get_ex_data_implementation(void) +const CRYPTO_EX_DATA_IMPL * +CRYPTO_get_ex_data_implementation(void) { IMPL_CHECK return impl; @@ -306,8 +306,8 @@ def_cleanup_cb(void *a_void) /* Return the EX_CLASS_ITEM from the "ex_data" hash table that corresponds to a * given class. Handles locking. */ -static EX_CLASS_ITEM -*def_get_class(int class_index) +static EX_CLASS_ITEM * +def_get_class(int class_index) { EX_CLASS_ITEM d, *p, *gen; EX_DATA_CHECK(return NULL;) @@ -622,8 +622,8 @@ CRYPTO_set_ex_data(CRYPTO_EX_DATA *ad, int idx, void *val) /* For a given CRYPTO_EX_DATA_ variable, get the value corresponding to a * particular index in the class used by this variable */ -void -*CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) +void * +CRYPTO_get_ex_data(const CRYPTO_EX_DATA *ad, int idx) { if (ad->sk == NULL) return (0); diff --git a/lib/libssl/src/crypto/x509/by_dir.c b/lib/libssl/src/crypto/x509/by_dir.c index 3b72fd302fd..76f8244f364 100644 --- a/lib/libssl/src/crypto/x509/by_dir.c +++ b/lib/libssl/src/crypto/x509/by_dir.c @@ -113,8 +113,8 @@ X509_LOOKUP_METHOD x509_dir_lookup = { NULL, /* get_by_alias */ }; -X509_LOOKUP_METHOD -*X509_LOOKUP_hash_dir(void) +X509_LOOKUP_METHOD * +X509_LOOKUP_hash_dir(void) { return (&x509_dir_lookup); } diff --git a/lib/libssl/src/crypto/x509/by_file.c b/lib/libssl/src/crypto/x509/by_file.c index 474d13bf0ec..93c951ee2ad 100644 --- a/lib/libssl/src/crypto/x509/by_file.c +++ b/lib/libssl/src/crypto/x509/by_file.c @@ -84,8 +84,8 @@ X509_LOOKUP_METHOD x509_file_lookup = { NULL, /* get_by_alias */ }; -X509_LOOKUP_METHOD -*X509_LOOKUP_file(void) +X509_LOOKUP_METHOD * +X509_LOOKUP_file(void) { return (&x509_file_lookup); } diff --git a/lib/libssl/src/crypto/x509/x_all.c b/lib/libssl/src/crypto/x509/x_all.c index 59099f026f8..2edec160228 100644 --- a/lib/libssl/src/crypto/x509/x_all.c +++ b/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) } #ifndef OPENSSL_NO_FP_API -X509 -*d2i_X509_fp(FILE *fp, X509 **x509) +X509 * +d2i_X509_fp(FILE *fp, X509 **x509) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509), fp, x509); } @@ -160,8 +160,8 @@ i2d_X509_fp(FILE *fp, X509 *x509) } #endif -X509 -*d2i_X509_bio(BIO *bp, X509 **x509) +X509 * +d2i_X509_bio(BIO *bp, X509 **x509) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509), bp, x509); } @@ -173,8 +173,8 @@ i2d_X509_bio(BIO *bp, X509 *x509) } #ifndef OPENSSL_NO_FP_API -X509_CRL -*d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) +X509_CRL * +d2i_X509_CRL_fp(FILE *fp, X509_CRL **crl) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_CRL), fp, crl); } @@ -186,8 +186,8 @@ i2d_X509_CRL_fp(FILE *fp, X509_CRL *crl) } #endif -X509_CRL -*d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) +X509_CRL * +d2i_X509_CRL_bio(BIO *bp, X509_CRL **crl) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_CRL), bp, crl); } @@ -199,8 +199,8 @@ i2d_X509_CRL_bio(BIO *bp, X509_CRL *crl) } #ifndef OPENSSL_NO_FP_API -PKCS7 -*d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) +PKCS7 * +d2i_PKCS7_fp(FILE *fp, PKCS7 **p7) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(PKCS7), fp, p7); } @@ -212,8 +212,8 @@ i2d_PKCS7_fp(FILE *fp, PKCS7 *p7) } #endif -PKCS7 -*d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) +PKCS7 * +d2i_PKCS7_bio(BIO *bp, PKCS7 **p7) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(PKCS7), bp, p7); } @@ -225,8 +225,8 @@ i2d_PKCS7_bio(BIO *bp, PKCS7 *p7) } #ifndef OPENSSL_NO_FP_API -X509_REQ -*d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) +X509_REQ * +d2i_X509_REQ_fp(FILE *fp, X509_REQ **req) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(X509_REQ), fp, req); } @@ -238,8 +238,8 @@ i2d_X509_REQ_fp(FILE *fp, X509_REQ *req) } #endif -X509_REQ -*d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) +X509_REQ * +d2i_X509_REQ_bio(BIO *bp, X509_REQ **req) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(X509_REQ), bp, req); } @@ -253,8 +253,8 @@ i2d_X509_REQ_bio(BIO *bp, X509_REQ *req) #ifndef OPENSSL_NO_RSA #ifndef OPENSSL_NO_FP_API -RSA -*d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) +RSA * +d2i_RSAPrivateKey_fp(FILE *fp, RSA **rsa) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); } @@ -265,15 +265,15 @@ i2d_RSAPrivateKey_fp(FILE *fp, RSA *rsa) return ASN1_item_i2d_fp(ASN1_ITEM_rptr(RSAPrivateKey), fp, rsa); } -RSA -*d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) +RSA * +d2i_RSAPublicKey_fp(FILE *fp, RSA **rsa) { return ASN1_item_d2i_fp(ASN1_ITEM_rptr(RSAPublicKey), fp, rsa); } -RSA -*d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) +RSA * +d2i_RSA_PUBKEY_fp(FILE *fp, RSA **rsa) { return ASN1_d2i_fp((void *(*)(void))RSA_new, (D2I_OF(void))d2i_RSA_PUBKEY, fp, (void **)rsa); @@ -292,8 +292,8 @@ i2d_RSA_PUBKEY_fp(FILE *fp, RSA *rsa) } #endif -RSA -*d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) +RSA * +d2i_RSAPrivateKey_bio(BIO *bp, RSA **rsa) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); } @@ -304,15 +304,15 @@ i2d_RSAPrivateKey_bio(BIO *bp, RSA *rsa) return ASN1_item_i2d_bio(ASN1_ITEM_rptr(RSAPrivateKey), bp, rsa); } -RSA -*d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) +RSA * +d2i_RSAPublicKey_bio(BIO *bp, RSA **rsa) { return ASN1_item_d2i_bio(ASN1_ITEM_rptr(RSAPublicKey), bp, rsa); } -RSA -*d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) +RSA * +d2i_RSA_PUBKEY_bio(BIO *bp, RSA **rsa) { return ASN1_d2i_bio_of(RSA, RSA_new, d2i_RSA_PUBKEY, bp, rsa); } @@ -332,8 +332,8 @@ i2d_RSA_PUBKEY_bio(BIO *bp, RSA *rsa) #ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_FP_API -DSA -*d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) +DSA * +d2i_DSAPrivateKey_fp(FILE *fp, DSA **dsa) { return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSAPrivateKey, fp, dsa); } @@ -344,8 +344,8 @@ i2d_DSAPrivateKey_fp(FILE *fp, DSA *dsa) return ASN1_i2d_fp_of_const(DSA, i2d_DSAPrivateKey, fp, dsa); } -DSA -*d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) +DSA * +d2i_DSA_PUBKEY_fp(FILE *fp, DSA **dsa) { return ASN1_d2i_fp_of(DSA, DSA_new, d2i_DSA_PUBKEY, fp, dsa); } @@ -357,8 +357,8 @@ i2d_DSA_PUBKEY_fp(FILE *fp, DSA *dsa) } #endif -DSA -*d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) +DSA * +d2i_DSAPrivateKey_bio(BIO *bp, DSA **dsa) { return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSAPrivateKey, bp, dsa); } @@ -369,8 +369,8 @@ i2d_DSAPrivateKey_bio(BIO *bp, DSA *dsa) return ASN1_i2d_bio_of_const(DSA, i2d_DSAPrivateKey, bp, dsa); } -DSA -*d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) +DSA * +d2i_DSA_PUBKEY_bio(BIO *bp, DSA **dsa) { return ASN1_d2i_bio_of(DSA, DSA_new, d2i_DSA_PUBKEY, bp, dsa); } @@ -385,8 +385,8 @@ i2d_DSA_PUBKEY_bio(BIO *bp, DSA *dsa) #ifndef OPENSSL_NO_EC #ifndef OPENSSL_NO_FP_API -EC_KEY -*d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) +EC_KEY * +d2i_EC_PUBKEY_fp(FILE *fp, EC_KEY **eckey) { return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, fp, eckey); } @@ -397,8 +397,8 @@ i2d_EC_PUBKEY_fp(FILE *fp, EC_KEY *eckey) return ASN1_i2d_fp_of(EC_KEY, i2d_EC_PUBKEY, fp, eckey); } -EC_KEY -*d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) +EC_KEY * +d2i_ECPrivateKey_fp(FILE *fp, EC_KEY **eckey) { return ASN1_d2i_fp_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, fp, eckey); } @@ -409,8 +409,8 @@ i2d_ECPrivateKey_fp(FILE *fp, EC_KEY *eckey) return ASN1_i2d_fp_of(EC_KEY, i2d_ECPrivateKey, fp, eckey); } #endif -EC_KEY -*d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) +EC_KEY * +d2i_EC_PUBKEY_bio(BIO *bp, EC_KEY **eckey) { return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_EC_PUBKEY, bp, eckey); } @@ -421,8 +421,8 @@ i2d_EC_PUBKEY_bio(BIO *bp, EC_KEY *ecdsa) return ASN1_i2d_bio_of(EC_KEY, i2d_EC_PUBKEY, bp, ecdsa); } -EC_KEY -*d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) +EC_KEY * +d2i_ECPrivateKey_bio(BIO *bp, EC_KEY **eckey) { return ASN1_d2i_bio_of(EC_KEY, EC_KEY_new, d2i_ECPrivateKey, bp, eckey); } @@ -488,8 +488,8 @@ PKCS7_ISSUER_AND_SERIAL_digest(PKCS7_ISSUER_AND_SERIAL *data, #ifndef OPENSSL_NO_FP_API -X509_SIG -*d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) +X509_SIG * +d2i_PKCS8_fp(FILE *fp, X509_SIG **p8) { return ASN1_d2i_fp_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, fp, p8); } @@ -501,8 +501,8 @@ i2d_PKCS8_fp(FILE *fp, X509_SIG *p8) } #endif -X509_SIG -*d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) +X509_SIG * +d2i_PKCS8_bio(BIO *bp, X509_SIG **p8) { return ASN1_d2i_bio_of(X509_SIG, X509_SIG_new, d2i_X509_SIG, bp, p8); } @@ -514,8 +514,8 @@ i2d_PKCS8_bio(BIO *bp, X509_SIG *p8) } #ifndef OPENSSL_NO_FP_API -PKCS8_PRIV_KEY_INFO -*d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, +PKCS8_PRIV_KEY_INFO * +d2i_PKCS8_PRIV_KEY_INFO_fp(FILE *fp, PKCS8_PRIV_KEY_INFO **p8inf) { 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) return ASN1_i2d_fp_of(EVP_PKEY, i2d_PrivateKey, fp, pkey); } -EVP_PKEY -*d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) +EVP_PKEY * +d2i_PrivateKey_fp(FILE *fp, EVP_PKEY **a) { return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, fp, a); @@ -561,16 +561,16 @@ i2d_PUBKEY_fp(FILE *fp, EVP_PKEY *pkey) return ASN1_i2d_fp_of(EVP_PKEY, i2d_PUBKEY, fp, pkey); } -EVP_PKEY -*d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) +EVP_PKEY * +d2i_PUBKEY_fp(FILE *fp, EVP_PKEY **a) { return ASN1_d2i_fp_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, fp, a); } #endif -PKCS8_PRIV_KEY_INFO -*d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, +PKCS8_PRIV_KEY_INFO * +d2i_PKCS8_PRIV_KEY_INFO_bio(BIO *bp, PKCS8_PRIV_KEY_INFO **p8inf) { 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) return ASN1_i2d_bio_of(EVP_PKEY, i2d_PrivateKey, bp, pkey); } -EVP_PKEY -*d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) +EVP_PKEY * +d2i_PrivateKey_bio(BIO *bp, EVP_PKEY **a) { return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_AutoPrivateKey, bp, a); } @@ -615,8 +615,8 @@ i2d_PUBKEY_bio(BIO *bp, EVP_PKEY *pkey) return ASN1_i2d_bio_of(EVP_PKEY, i2d_PUBKEY, bp, pkey); } -EVP_PKEY -*d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) +EVP_PKEY * +d2i_PUBKEY_bio(BIO *bp, EVP_PKEY **a) { return ASN1_d2i_bio_of(EVP_PKEY, EVP_PKEY_new, d2i_PUBKEY, bp, a); } -- 2.20.1