diff options
author | markus <> | 2002-09-16 19:15:48 +0000 |
---|---|---|
committer | markus <> | 2002-09-16 19:15:48 +0000 |
commit | 4d6389cd9417e0c5eb63bd6c309c70ce1850e3cc (patch) | |
tree | b45ec2dfe6bcb1e41abda415b2e3376919d07ff4 /src | |
parent | 2f170519391284b462038f569312975802b3589c (diff) | |
download | openbsd-4d6389cd9417e0c5eb63bd6c309c70ce1850e3cc.tar.gz openbsd-4d6389cd9417e0c5eb63bd6c309c70ce1850e3cc.tar.bz2 openbsd-4d6389cd9417e0c5eb63bd6c309c70ce1850e3cc.zip |
sync with 0.9.7-beta3
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/des/des_old.h | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/des_old.h | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/lib/libcrypto/des/des_old.h b/src/lib/libcrypto/des/des_old.h index 2b7c0fc02a..51b987422a 100644 --- a/src/lib/libcrypto/des/des_old.h +++ b/src/lib/libcrypto/des/des_old.h | |||
@@ -173,6 +173,10 @@ typedef struct _ossl_old_des_ks_struct | |||
173 | DES_fcrypt((b),(s),(r)) | 173 | DES_fcrypt((b),(s),(r)) |
174 | #define des_crypt(b,s)\ | 174 | #define des_crypt(b,s)\ |
175 | DES_crypt((b),(s)) | 175 | DES_crypt((b),(s)) |
176 | #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) | ||
177 | #define crypt(b,s)\ | ||
178 | DES_crypt((b),(s)) | ||
179 | #endif | ||
176 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ | 180 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ |
177 | DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv)) | 181 | DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv)) |
178 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ | 182 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ |
diff --git a/src/lib/libssl/src/crypto/des/des_old.h b/src/lib/libssl/src/crypto/des/des_old.h index 2b7c0fc02a..51b987422a 100644 --- a/src/lib/libssl/src/crypto/des/des_old.h +++ b/src/lib/libssl/src/crypto/des/des_old.h | |||
@@ -173,6 +173,10 @@ typedef struct _ossl_old_des_ks_struct | |||
173 | DES_fcrypt((b),(s),(r)) | 173 | DES_fcrypt((b),(s),(r)) |
174 | #define des_crypt(b,s)\ | 174 | #define des_crypt(b,s)\ |
175 | DES_crypt((b),(s)) | 175 | DES_crypt((b),(s)) |
176 | #if !defined(PERL5) && !defined(__FreeBSD__) && !defined(NeXT) && !defined(__OpenBSD__) | ||
177 | #define crypt(b,s)\ | ||
178 | DES_crypt((b),(s)) | ||
179 | #endif | ||
176 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ | 180 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ |
177 | DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv)) | 181 | DES_ofb_encrypt((i),(o),(n),(l),&(k),(iv)) |
178 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ | 182 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ |