diff options
| author | hin <> | 2003-04-03 12:03:21 +0000 |
|---|---|---|
| committer | hin <> | 2003-04-03 12:03:21 +0000 |
| commit | 030af986882598665482e3f4c559bdfd01f78eca (patch) | |
| tree | 457bb59175a448996c5a93d8953c5ed451b20f3c | |
| parent | 1c0001600aef97c33c154150432dcdbdc86b0d75 (diff) | |
| download | openbsd-030af986882598665482e3f4c559bdfd01f78eca.tar.gz openbsd-030af986882598665482e3f4c559bdfd01f78eca.tar.bz2 openbsd-030af986882598665482e3f4c559bdfd01f78eca.zip | |
Remove crypt macro, it conflicts with unistd.h
ok markus@
| -rw-r--r-- | src/lib/libcrypto/des/des_old.h | 2 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/des/des_old.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/libcrypto/des/des_old.h b/src/lib/libcrypto/des/des_old.h index 51b987422a..fe32f21f61 100644 --- a/src/lib/libcrypto/des/des_old.h +++ b/src/lib/libcrypto/des/des_old.h | |||
| @@ -274,8 +274,10 @@ typedef struct _ossl_old_des_ks_struct | |||
| 274 | _ossl_old_des_fcrypt((b),(s),(r)) | 274 | _ossl_old_des_fcrypt((b),(s),(r)) |
| 275 | #define des_crypt(b,s)\ | 275 | #define des_crypt(b,s)\ |
| 276 | _ossl_old_des_crypt((b),(s)) | 276 | _ossl_old_des_crypt((b),(s)) |
| 277 | #if 0 | ||
| 277 | #define crypt(b,s)\ | 278 | #define crypt(b,s)\ |
| 278 | _ossl_old_crypt((b),(s)) | 279 | _ossl_old_crypt((b),(s)) |
| 280 | #endif | ||
| 279 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ | 281 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ |
| 280 | _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv)) | 282 | _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv)) |
| 281 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ | 283 | #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 51b987422a..fe32f21f61 100644 --- a/src/lib/libssl/src/crypto/des/des_old.h +++ b/src/lib/libssl/src/crypto/des/des_old.h | |||
| @@ -274,8 +274,10 @@ typedef struct _ossl_old_des_ks_struct | |||
| 274 | _ossl_old_des_fcrypt((b),(s),(r)) | 274 | _ossl_old_des_fcrypt((b),(s),(r)) |
| 275 | #define des_crypt(b,s)\ | 275 | #define des_crypt(b,s)\ |
| 276 | _ossl_old_des_crypt((b),(s)) | 276 | _ossl_old_des_crypt((b),(s)) |
| 277 | #if 0 | ||
| 277 | #define crypt(b,s)\ | 278 | #define crypt(b,s)\ |
| 278 | _ossl_old_crypt((b),(s)) | 279 | _ossl_old_crypt((b),(s)) |
| 280 | #endif | ||
| 279 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ | 281 | #define des_ofb_encrypt(i,o,n,l,k,iv)\ |
| 280 | _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv)) | 282 | _ossl_old_des_ofb_encrypt((i),(o),(n),(l),(k),(iv)) |
| 281 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ | 283 | #define des_pcbc_encrypt(i,o,l,k,iv,e)\ |