diff options
author | markus <> | 2002-09-05 22:44:52 +0000 |
---|---|---|
committer | markus <> | 2002-09-05 22:44:52 +0000 |
commit | 715a204e4615e4a70a466fcb383a9a57cad5e6b8 (patch) | |
tree | 2d2e93c4a34d1f7f04aba73706353332d7700641 /src/lib/libcrypto/evp | |
parent | 15b5d84f9da2ce4bfae8580e56e34a859f74ad71 (diff) | |
download | openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.tar.gz openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.tar.bz2 openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.zip |
import openssl-0.9.7-beta3
Diffstat (limited to 'src/lib/libcrypto/evp')
-rw-r--r-- | src/lib/libcrypto/evp/c_all.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp.h | 56 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/evp_pbe.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/p5_crpt.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/evp/p5_crpt2.c | 2 |
5 files changed, 61 insertions, 3 deletions
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c index 5ffd352ea0..2d3e57c4fa 100644 --- a/src/lib/libcrypto/evp/c_all.c +++ b/src/lib/libcrypto/evp/c_all.c | |||
@@ -60,12 +60,14 @@ | |||
60 | #include "cryptlib.h" | 60 | #include "cryptlib.h" |
61 | #include <openssl/evp.h> | 61 | #include <openssl/evp.h> |
62 | 62 | ||
63 | #if 0 | ||
63 | #undef OpenSSL_add_all_algorithms | 64 | #undef OpenSSL_add_all_algorithms |
64 | 65 | ||
65 | void OpenSSL_add_all_algorithms(void) | 66 | void OpenSSL_add_all_algorithms(void) |
66 | { | 67 | { |
67 | OPENSSL_add_all_algorithms_noconf(); | 68 | OPENSSL_add_all_algorithms_noconf(); |
68 | } | 69 | } |
70 | #endif | ||
69 | 71 | ||
70 | void OPENSSL_add_all_algorithms_noconf(void) | 72 | void OPENSSL_add_all_algorithms_noconf(void) |
71 | { | 73 | { |
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h index fb16de6852..45a25f968d 100644 --- a/src/lib/libcrypto/evp/evp.h +++ b/src/lib/libcrypto/evp/evp.h | |||
@@ -74,6 +74,48 @@ | |||
74 | #ifndef OPENSSL_NO_BIO | 74 | #ifndef OPENSSL_NO_BIO |
75 | #include <openssl/bio.h> | 75 | #include <openssl/bio.h> |
76 | #endif | 76 | #endif |
77 | #ifndef OPENSSL_NO_MD2 | ||
78 | #include <openssl/md2.h> | ||
79 | #endif | ||
80 | #ifndef OPENSSL_NO_MD4 | ||
81 | #include <openssl/md4.h> | ||
82 | #endif | ||
83 | #ifndef OPENSSL_NO_MD5 | ||
84 | #include <openssl/md5.h> | ||
85 | #endif | ||
86 | #ifndef OPENSSL_NO_SHA | ||
87 | #include <openssl/sha.h> | ||
88 | #endif | ||
89 | #ifndef OPENSSL_NO_RIPEMD | ||
90 | #include <openssl/ripemd.h> | ||
91 | #endif | ||
92 | #ifndef OPENSSL_NO_DES | ||
93 | #include <openssl/des.h> | ||
94 | #endif | ||
95 | #ifndef OPENSSL_NO_RC4 | ||
96 | #include <openssl/rc4.h> | ||
97 | #endif | ||
98 | #ifndef OPENSSL_NO_RC2 | ||
99 | #include <openssl/rc2.h> | ||
100 | #endif | ||
101 | #ifndef OPENSSL_NO_RC5 | ||
102 | #include <openssl/rc5.h> | ||
103 | #endif | ||
104 | #ifndef OPENSSL_NO_BF | ||
105 | #include <openssl/blowfish.h> | ||
106 | #endif | ||
107 | #ifndef OPENSSL_NO_CAST | ||
108 | #include <openssl/cast.h> | ||
109 | #endif | ||
110 | #ifndef OPENSSL_NO_IDEA | ||
111 | #include <openssl/idea.h> | ||
112 | #endif | ||
113 | #ifndef OPENSSL_NO_MDC2 | ||
114 | #include <openssl/mdc2.h> | ||
115 | #endif | ||
116 | #ifndef OPENSSL_NO_AES | ||
117 | #include <openssl/aes.h> | ||
118 | #endif | ||
77 | 119 | ||
78 | /* | 120 | /* |
79 | #define EVP_RC2_KEY_SIZE 16 | 121 | #define EVP_RC2_KEY_SIZE 16 |
@@ -91,6 +133,18 @@ | |||
91 | /* Default PKCS#5 iteration count */ | 133 | /* Default PKCS#5 iteration count */ |
92 | #define PKCS5_DEFAULT_ITER 2048 | 134 | #define PKCS5_DEFAULT_ITER 2048 |
93 | 135 | ||
136 | #ifndef OPENSSL_NO_RSA | ||
137 | #include <openssl/rsa.h> | ||
138 | #endif | ||
139 | |||
140 | #ifndef OPENSSL_NO_DSA | ||
141 | #include <openssl/dsa.h> | ||
142 | #endif | ||
143 | |||
144 | #ifndef OPENSSL_NO_DH | ||
145 | #include <openssl/dh.h> | ||
146 | #endif | ||
147 | |||
94 | #include <openssl/objects.h> | 148 | #include <openssl/objects.h> |
95 | 149 | ||
96 | #define EVP_PK_RSA 0x0001 | 150 | #define EVP_PK_RSA 0x0001 |
@@ -582,6 +636,8 @@ const EVP_CIPHER *EVP_enc_null(void); /* does nothing :-) */ | |||
582 | const EVP_CIPHER *EVP_des_ecb(void); | 636 | const EVP_CIPHER *EVP_des_ecb(void); |
583 | const EVP_CIPHER *EVP_des_ede(void); | 637 | const EVP_CIPHER *EVP_des_ede(void); |
584 | const EVP_CIPHER *EVP_des_ede3(void); | 638 | const EVP_CIPHER *EVP_des_ede3(void); |
639 | const EVP_CIPHER *EVP_des_ede_ecb(void); | ||
640 | const EVP_CIPHER *EVP_des_ede3_ecb(void); | ||
585 | const EVP_CIPHER *EVP_des_cfb(void); | 641 | const EVP_CIPHER *EVP_des_cfb(void); |
586 | const EVP_CIPHER *EVP_des_ede_cfb(void); | 642 | const EVP_CIPHER *EVP_des_ede_cfb(void); |
587 | const EVP_CIPHER *EVP_des_ede3_cfb(void); | 643 | const EVP_CIPHER *EVP_des_ede3_cfb(void); |
diff --git a/src/lib/libcrypto/evp/evp_pbe.c b/src/lib/libcrypto/evp/evp_pbe.c index 06afb9d152..bcd4d29f85 100644 --- a/src/lib/libcrypto/evp/evp_pbe.c +++ b/src/lib/libcrypto/evp/evp_pbe.c | |||
@@ -57,9 +57,9 @@ | |||
57 | */ | 57 | */ |
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include "cryptlib.h" | ||
60 | #include <openssl/evp.h> | 61 | #include <openssl/evp.h> |
61 | #include <openssl/x509.h> | 62 | #include <openssl/x509.h> |
62 | #include "cryptlib.h" | ||
63 | 63 | ||
64 | /* Password based encryption (PBE) functions */ | 64 | /* Password based encryption (PBE) functions */ |
65 | 65 | ||
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c index 113c60fedb..27a8286489 100644 --- a/src/lib/libcrypto/evp/p5_crpt.c +++ b/src/lib/libcrypto/evp/p5_crpt.c | |||
@@ -58,9 +58,9 @@ | |||
58 | 58 | ||
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <stdlib.h> | 60 | #include <stdlib.h> |
61 | #include "cryptlib.h" | ||
61 | #include <openssl/x509.h> | 62 | #include <openssl/x509.h> |
62 | #include <openssl/evp.h> | 63 | #include <openssl/evp.h> |
63 | #include "cryptlib.h" | ||
64 | 64 | ||
65 | /* PKCS#5 v1.5 compatible PBE functions: see PKCS#5 v2.0 for more info. | 65 | /* PKCS#5 v1.5 compatible PBE functions: see PKCS#5 v2.0 for more info. |
66 | */ | 66 | */ |
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c index 7881860b53..7485d6a278 100644 --- a/src/lib/libcrypto/evp/p5_crpt2.c +++ b/src/lib/libcrypto/evp/p5_crpt2.c | |||
@@ -58,10 +58,10 @@ | |||
58 | #if !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA) | 58 | #if !defined(OPENSSL_NO_HMAC) && !defined(OPENSSL_NO_SHA) |
59 | #include <stdio.h> | 59 | #include <stdio.h> |
60 | #include <stdlib.h> | 60 | #include <stdlib.h> |
61 | #include "cryptlib.h" | ||
61 | #include <openssl/x509.h> | 62 | #include <openssl/x509.h> |
62 | #include <openssl/evp.h> | 63 | #include <openssl/evp.h> |
63 | #include <openssl/hmac.h> | 64 | #include <openssl/hmac.h> |
64 | #include "cryptlib.h" | ||
65 | 65 | ||
66 | /* set this to print out info about the keygen algorithm */ | 66 | /* set this to print out info about the keygen algorithm */ |
67 | /* #define DEBUG_PKCS5V2 */ | 67 | /* #define DEBUG_PKCS5V2 */ |