diff options
author | jsing <> | 2014-04-14 13:10:35 +0000 |
---|---|---|
committer | jsing <> | 2014-04-14 13:10:35 +0000 |
commit | b12a89b75a526f5ae9bbd6bfff6053e21295fd2a (patch) | |
tree | 7ee2ebf15684ee99e649ef8b3b2dd289398f6325 /src/lib/libssl/ssl_algs.c | |
parent | abb7d374248574dba5fd92eb363fdf180c877abc (diff) | |
download | openbsd-b12a89b75a526f5ae9bbd6bfff6053e21295fd2a.tar.gz openbsd-b12a89b75a526f5ae9bbd6bfff6053e21295fd2a.tar.bz2 openbsd-b12a89b75a526f5ae9bbd6bfff6053e21295fd2a.zip |
First pass at applying KNF to the OpenSSL code, which almost makes it
readable. This pass is whitespace only and can readily be verified using
tr and md5.
Diffstat (limited to 'src/lib/libssl/ssl_algs.c')
-rw-r--r-- | src/lib/libssl/ssl_algs.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/lib/libssl/ssl_algs.c b/src/lib/libssl/ssl_algs.c index 9c34d19725..76644bda91 100644 --- a/src/lib/libssl/ssl_algs.c +++ b/src/lib/libssl/ssl_algs.c | |||
@@ -61,8 +61,9 @@ | |||
61 | #include <openssl/lhash.h> | 61 | #include <openssl/lhash.h> |
62 | #include "ssl_locl.h" | 62 | #include "ssl_locl.h" |
63 | 63 | ||
64 | int SSL_library_init(void) | 64 | int |
65 | { | 65 | SSL_library_init(void) |
66 | { | ||
66 | 67 | ||
67 | #ifndef OPENSSL_NO_DES | 68 | #ifndef OPENSSL_NO_DES |
68 | EVP_add_cipher(EVP_des_cbc()); | 69 | EVP_add_cipher(EVP_des_cbc()); |
@@ -104,16 +105,16 @@ int SSL_library_init(void) | |||
104 | #ifndef OPENSSL_NO_SEED | 105 | #ifndef OPENSSL_NO_SEED |
105 | EVP_add_cipher(EVP_seed_cbc()); | 106 | EVP_add_cipher(EVP_seed_cbc()); |
106 | #endif | 107 | #endif |
107 | 108 | ||
108 | #ifndef OPENSSL_NO_MD5 | 109 | #ifndef OPENSSL_NO_MD5 |
109 | EVP_add_digest(EVP_md5()); | 110 | EVP_add_digest(EVP_md5()); |
110 | EVP_add_digest_alias(SN_md5,"ssl2-md5"); | 111 | EVP_add_digest_alias(SN_md5, "ssl2-md5"); |
111 | EVP_add_digest_alias(SN_md5,"ssl3-md5"); | 112 | EVP_add_digest_alias(SN_md5, "ssl3-md5"); |
112 | #endif | 113 | #endif |
113 | #ifndef OPENSSL_NO_SHA | 114 | #ifndef OPENSSL_NO_SHA |
114 | EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ | 115 | EVP_add_digest(EVP_sha1()); /* RSA with sha1 */ |
115 | EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); | 116 | EVP_add_digest_alias(SN_sha1, "ssl3-sha1"); |
116 | EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); | 117 | EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA); |
117 | #endif | 118 | #endif |
118 | #ifndef OPENSSL_NO_SHA256 | 119 | #ifndef OPENSSL_NO_SHA256 |
119 | EVP_add_digest(EVP_sha224()); | 120 | EVP_add_digest(EVP_sha224()); |
@@ -125,9 +126,9 @@ int SSL_library_init(void) | |||
125 | #endif | 126 | #endif |
126 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_DSA) | 127 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_DSA) |
127 | EVP_add_digest(EVP_dss1()); /* DSA with sha1 */ | 128 | EVP_add_digest(EVP_dss1()); /* DSA with sha1 */ |
128 | EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2); | 129 | EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2); |
129 | EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1"); | 130 | EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1"); |
130 | EVP_add_digest_alias(SN_dsaWithSHA1,"dss1"); | 131 | EVP_add_digest_alias(SN_dsaWithSHA1, "dss1"); |
131 | #endif | 132 | #endif |
132 | #ifndef OPENSSL_NO_ECDSA | 133 | #ifndef OPENSSL_NO_ECDSA |
133 | EVP_add_digest(EVP_ecdsa()); | 134 | EVP_add_digest(EVP_ecdsa()); |
@@ -145,6 +146,6 @@ int SSL_library_init(void) | |||
145 | #endif | 146 | #endif |
146 | /* initialize cipher/digest methods table */ | 147 | /* initialize cipher/digest methods table */ |
147 | ssl_load_ciphers(); | 148 | ssl_load_ciphers(); |
148 | return(1); | 149 | return (1); |
149 | } | 150 | } |
150 | 151 | ||