Don't mix real tabs with tabs expanded as 8 spaces -- that's a pain to read when using 4-space tabs.
diff --git a/ssl/s23_lib.c b/ssl/s23_lib.c index 8a9a9b6..822a395 100644 --- a/ssl/s23_lib.c +++ b/ssl/s23_lib.c
@@ -77,7 +77,7 @@ ssl_undefined_function, ssl_undefined_function, ssl23_read, - (int (*)(struct ssl_st *, char *, int))ssl_undefined_function, + (int (*)(struct ssl_st *, char *, int))ssl_undefined_function, ssl23_write, ssl_undefined_function, ssl_undefined_function,
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index de07ac7..38d42c4 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c
@@ -757,7 +757,7 @@ } i=ssl_verify_cert_chain(s,sk); - if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)) + if ((s->verify_mode != SSL_VERIFY_NONE) && (!i)) { al=ssl_verify_alarm_type(s->verify_result); SSLerr(SSL_F_SSL3_GET_SERVER_CERTIFICATE,SSL_R_CERTIFICATE_VERIFY_FAILED);
diff --git a/ssl/ssl_algs.c b/ssl/ssl_algs.c index 726289a..a91ee6d 100644 --- a/ssl/ssl_algs.c +++ b/ssl/ssl_algs.c
@@ -71,14 +71,14 @@ EVP_add_cipher(EVP_idea_cbc()); #endif #ifndef NO_RC4 - EVP_add_cipher(EVP_rc4()); + EVP_add_cipher(EVP_rc4()); #endif #ifndef NO_RC2 - EVP_add_cipher(EVP_rc2_cbc()); + EVP_add_cipher(EVP_rc2_cbc()); #endif #ifndef NO_MD2 - EVP_add_digest(EVP_md2()); + EVP_add_digest(EVP_md2()); #endif #ifndef NO_MD5 EVP_add_digest(EVP_md5());
diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c index 569cfde..4c2989c 100644 --- a/ssl/ssl_ciph.c +++ b/ssl/ssl_ciph.c
@@ -614,7 +614,7 @@ char *SSL_CIPHER_description(SSL_CIPHER *cipher, char *buf, int len) { - int is_export,pkl,kl; + int is_export,pkl,kl; char *ver,*exp; char *kx,*au,*enc,*mac; unsigned long alg,alg2; @@ -623,10 +623,10 @@ alg=cipher->algorithms; alg2=cipher->algorithm2; - is_export=SSL_IS_EXPORT(alg); + is_export=SSL_IS_EXPORT(alg); pkl=SSL_EXPORT_PKEYLENGTH(alg); kl=SSL_EXPORT_KEYLENGTH(alg); - exp=is_export?" export":""; + exp=is_export?" export":""; if (alg & SSL_SSLV2) ver="SSLv2"; @@ -638,7 +638,7 @@ switch (alg&SSL_MKEY_MASK) { case SSL_kRSA: - kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA"; + kx=is_export?(pkl == 512 ? "RSA(512)" : "RSA(1024)"):"RSA"; break; case SSL_kDHr: kx="DH/RSA"; @@ -650,7 +650,7 @@ kx="Fortezza"; break; case SSL_kEDH: - kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH"; + kx=is_export?(pkl == 512 ? "DH(512)" : "DH(1024)"):"DH"; break; default: kx="unknown"; @@ -679,17 +679,17 @@ switch (alg&SSL_ENC_MASK) { case SSL_DES: - enc=(is_export && kl == 5)?"DES(40)":"DES(56)"; + enc=(is_export && kl == 5)?"DES(40)":"DES(56)"; break; case SSL_3DES: enc="3DES(168)"; break; case SSL_RC4: - enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)") + enc=is_export?(kl == 5 ? "RC4(40)" : "RC4(56)") :((alg2&SSL2_CF_8_BYTE_ENC)?"RC4(64)":"RC4(128)"); break; case SSL_RC2: - enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)"; + enc=is_export?(kl == 5 ? "RC2(40)" : "RC2(56)"):"RC2(128)"; break; case SSL_IDEA: enc="IDEA(128)";
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 816afb2..c72f0ee 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c
@@ -1524,7 +1524,7 @@ { STACK_OF(X509_NAME) *sk; X509_NAME *xn; - SSL *ret; + SSL *ret; int i; if ((ret=SSL_new(SSL_get_SSL_CTX(s))) == NULL) @@ -1674,9 +1674,9 @@ SSL_CIPHER *SSL_get_current_cipher(SSL *s) { - if ((s->session != NULL) && (s->session->cipher != NULL)) - return(s->session->cipher); - return(NULL); + if ((s->session != NULL) && (s->session->cipher != NULL)) + return(s->session->cipher); + return(NULL); } int ssl_init_wbio_buffer(SSL *s,int push) @@ -1814,11 +1814,11 @@ int SSL_get_ex_new_index(long argl,char *argp,int (*new_func)(), int (*dup_func)(),void (*free_func)()) - { + { ssl_meth_num++; return(CRYPTO_get_ex_new_index(ssl_meth_num-1, &ssl_meth,argl,argp,new_func,dup_func,free_func)); - } + } int SSL_set_ex_data(SSL *s,int idx,void *arg) { @@ -1832,11 +1832,11 @@ int SSL_CTX_get_ex_new_index(long argl,char *argp,int (*new_func)(), int (*dup_func)(),void (*free_func)()) - { + { ssl_ctx_meth_num++; return(CRYPTO_get_ex_new_index(ssl_ctx_meth_num-1, &ssl_ctx_meth,argl,argp,new_func,dup_func,free_func)); - } + } int SSL_CTX_set_ex_data(SSL_CTX *s,int idx,void *arg) {
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 97c7f33..681499f 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c
@@ -74,12 +74,12 @@ int SSL_SESSION_get_ex_new_index(long argl, char *argp, int (*new_func)(), int (*dup_func)(), void (*free_func)()) - { - ssl_session_num++; - return(CRYPTO_get_ex_new_index(ssl_session_num-1, + { + ssl_session_num++; + return(CRYPTO_get_ex_new_index(ssl_session_num-1, &ssl_session_meth, - argl,argp,new_func,dup_func,free_func)); - } + argl,argp,new_func,dup_func,free_func)); + } int SSL_SESSION_set_ex_data(SSL_SESSION *s, int idx, void *arg) {
diff --git a/ssl/ssl_txt.c b/ssl/ssl_txt.c index df0af09..ca67a98 100644 --- a/ssl/ssl_txt.c +++ b/ssl/ssl_txt.c
@@ -62,20 +62,20 @@ #ifndef NO_FP_API int SSL_SESSION_print_fp(FILE *fp, SSL_SESSION *x) - { - BIO *b; - int ret; + { + BIO *b; + int ret; - if ((b=BIO_new(BIO_s_file_internal())) == NULL) + if ((b=BIO_new(BIO_s_file_internal())) == NULL) { SSLerr(SSL_F_SSL_SESSION_PRINT_FP,ERR_R_BUF_LIB); - return(0); + return(0); } - BIO_set_fp(b,fp,BIO_NOCLOSE); - ret=SSL_SESSION_print(b,x); - BIO_free(b); - return(ret); - } + BIO_set_fp(b,fp,BIO_NOCLOSE); + ret=SSL_SESSION_print(b,x); + BIO_free(b); + return(ret); + } #endif int SSL_SESSION_print(BIO *bp, SSL_SESSION *x)