diff options
author | jsing <> | 2014-05-07 17:42:51 +0000 |
---|---|---|
committer | jsing <> | 2014-05-07 17:42:51 +0000 |
commit | dd9b16d5489a1196ae0fcbe4315fe0122b042d7d (patch) | |
tree | b341b2cdc0818410f55d0a4662a40677e4899326 /src/lib/libcrypto/evp/c_alld.c | |
parent | 1b7393e13080fa69e951cc4f482e3d5d85639c70 (diff) | |
download | openbsd-dd9b16d5489a1196ae0fcbe4315fe0122b042d7d.tar.gz openbsd-dd9b16d5489a1196ae0fcbe4315fe0122b042d7d.tar.bz2 openbsd-dd9b16d5489a1196ae0fcbe4315fe0122b042d7d.zip |
KNF.
Diffstat (limited to 'src/lib/libcrypto/evp/c_alld.c')
-rw-r--r-- | src/lib/libcrypto/evp/c_alld.c | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/src/lib/libcrypto/evp/c_alld.c b/src/lib/libcrypto/evp/c_alld.c index 311e1fe2f8..4bd1b0bd92 100644 --- a/src/lib/libcrypto/evp/c_alld.c +++ b/src/lib/libcrypto/evp/c_alld.c | |||
@@ -5,21 +5,21 @@ | |||
5 | * This package is an SSL implementation written | 5 | * This package is an SSL implementation written |
6 | * by Eric Young (eay@cryptsoft.com). | 6 | * by Eric Young (eay@cryptsoft.com). |
7 | * The implementation was written so as to conform with Netscapes SSL. | 7 | * The implementation was written so as to conform with Netscapes SSL. |
8 | * | 8 | * |
9 | * This library is free for commercial and non-commercial use as long as | 9 | * This library is free for commercial and non-commercial use as long as |
10 | * the following conditions are aheared to. The following conditions | 10 | * the following conditions are aheared to. The following conditions |
11 | * apply to all code found in this distribution, be it the RC4, RSA, | 11 | * apply to all code found in this distribution, be it the RC4, RSA, |
12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation | 12 | * lhash, DES, etc., code; not just the SSL code. The SSL documentation |
13 | * included with this distribution is covered by the same copyright terms | 13 | * included with this distribution is covered by the same copyright terms |
14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). | 14 | * except that the holder is Tim Hudson (tjh@cryptsoft.com). |
15 | * | 15 | * |
16 | * Copyright remains Eric Young's, and as such any Copyright notices in | 16 | * Copyright remains Eric Young's, and as such any Copyright notices in |
17 | * the code are not to be removed. | 17 | * the code are not to be removed. |
18 | * If this package is used in a product, Eric Young should be given attribution | 18 | * If this package is used in a product, Eric Young should be given attribution |
19 | * as the author of the parts of the library used. | 19 | * as the author of the parts of the library used. |
20 | * This can be in the form of a textual message at program startup or | 20 | * This can be in the form of a textual message at program startup or |
21 | * in documentation (online or textual) provided with the package. | 21 | * in documentation (online or textual) provided with the package. |
22 | * | 22 | * |
23 | * Redistribution and use in source and binary forms, with or without | 23 | * Redistribution and use in source and binary forms, with or without |
24 | * modification, are permitted provided that the following conditions | 24 | * modification, are permitted provided that the following conditions |
25 | * are met: | 25 | * are met: |
@@ -34,10 +34,10 @@ | |||
34 | * Eric Young (eay@cryptsoft.com)" | 34 | * Eric Young (eay@cryptsoft.com)" |
35 | * The word 'cryptographic' can be left out if the rouines from the library | 35 | * The word 'cryptographic' can be left out if the rouines from the library |
36 | * being used are not cryptographic related :-). | 36 | * being used are not cryptographic related :-). |
37 | * 4. If you include any Windows specific code (or a derivative thereof) from | 37 | * 4. If you include any Windows specific code (or a derivative thereof) from |
38 | * the apps directory (application code) you must include an acknowledgement: | 38 | * the apps directory (application code) you must include an acknowledgement: |
39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" | 39 | * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" |
40 | * | 40 | * |
41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND | 41 | * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND |
42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 42 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | 43 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
@@ -49,7 +49,7 @@ | |||
49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | 49 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY |
50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 50 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
51 | * SUCH DAMAGE. | 51 | * SUCH DAMAGE. |
52 | * | 52 | * |
53 | * The licence and distribution terms for any publically available version or | 53 | * The licence and distribution terms for any publically available version or |
54 | * derivative of this code cannot be changed. i.e. this code cannot simply be | 54 | * derivative of this code cannot be changed. i.e. this code cannot simply be |
55 | * copied and put under another distribution licence | 55 | * copied and put under another distribution licence |
@@ -62,15 +62,16 @@ | |||
62 | #include <openssl/pkcs12.h> | 62 | #include <openssl/pkcs12.h> |
63 | #include <openssl/objects.h> | 63 | #include <openssl/objects.h> |
64 | 64 | ||
65 | void OpenSSL_add_all_digests(void) | 65 | void |
66 | { | 66 | OpenSSL_add_all_digests(void) |
67 | { | ||
67 | #ifndef OPENSSL_NO_MD4 | 68 | #ifndef OPENSSL_NO_MD4 |
68 | EVP_add_digest(EVP_md4()); | 69 | EVP_add_digest(EVP_md4()); |
69 | #endif | 70 | #endif |
70 | #ifndef OPENSSL_NO_MD5 | 71 | #ifndef OPENSSL_NO_MD5 |
71 | EVP_add_digest(EVP_md5()); | 72 | EVP_add_digest(EVP_md5()); |
72 | EVP_add_digest_alias(SN_md5,"ssl2-md5"); | 73 | EVP_add_digest_alias(SN_md5, "ssl2-md5"); |
73 | EVP_add_digest_alias(SN_md5,"ssl3-md5"); | 74 | EVP_add_digest_alias(SN_md5, "ssl3-md5"); |
74 | #endif | 75 | #endif |
75 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0) | 76 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0) |
76 | EVP_add_digest(EVP_sha()); | 77 | EVP_add_digest(EVP_sha()); |
@@ -80,13 +81,13 @@ void OpenSSL_add_all_digests(void) | |||
80 | #endif | 81 | #endif |
81 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) | 82 | #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1) |
82 | EVP_add_digest(EVP_sha1()); | 83 | EVP_add_digest(EVP_sha1()); |
83 | EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); | 84 | EVP_add_digest_alias(SN_sha1, "ssl3-sha1"); |
84 | EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); | 85 | EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA); |
85 | #ifndef OPENSSL_NO_DSA | 86 | #ifndef OPENSSL_NO_DSA |
86 | EVP_add_digest(EVP_dss1()); | 87 | EVP_add_digest(EVP_dss1()); |
87 | EVP_add_digest_alias(SN_dsaWithSHA1,SN_dsaWithSHA1_2); | 88 | EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2); |
88 | EVP_add_digest_alias(SN_dsaWithSHA1,"DSS1"); | 89 | EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1"); |
89 | EVP_add_digest_alias(SN_dsaWithSHA1,"dss1"); | 90 | EVP_add_digest_alias(SN_dsaWithSHA1, "dss1"); |
90 | #endif | 91 | #endif |
91 | #ifndef OPENSSL_NO_ECDSA | 92 | #ifndef OPENSSL_NO_ECDSA |
92 | EVP_add_digest(EVP_ecdsa()); | 93 | EVP_add_digest(EVP_ecdsa()); |
@@ -97,8 +98,8 @@ void OpenSSL_add_all_digests(void) | |||
97 | #endif | 98 | #endif |
98 | #ifndef OPENSSL_NO_RIPEMD | 99 | #ifndef OPENSSL_NO_RIPEMD |
99 | EVP_add_digest(EVP_ripemd160()); | 100 | EVP_add_digest(EVP_ripemd160()); |
100 | EVP_add_digest_alias(SN_ripemd160,"ripemd"); | 101 | EVP_add_digest_alias(SN_ripemd160, "ripemd"); |
101 | EVP_add_digest_alias(SN_ripemd160,"rmd160"); | 102 | EVP_add_digest_alias(SN_ripemd160, "rmd160"); |
102 | #endif | 103 | #endif |
103 | #ifndef OPENSSL_NO_SHA256 | 104 | #ifndef OPENSSL_NO_SHA256 |
104 | EVP_add_digest(EVP_sha224()); | 105 | EVP_add_digest(EVP_sha224()); |
@@ -111,4 +112,4 @@ void OpenSSL_add_all_digests(void) | |||
111 | #ifndef OPENSSL_NO_WHIRLPOOL | 112 | #ifndef OPENSSL_NO_WHIRLPOOL |
112 | EVP_add_digest(EVP_whirlpool()); | 113 | EVP_add_digest(EVP_whirlpool()); |
113 | #endif | 114 | #endif |
114 | } | 115 | } |