diff options
author | Damien Miller <djm@mindrot.org> | 2013-02-12 11:00:34 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-02-12 11:00:34 +1100 |
commit | f0a8ded824a0149940a8c95755da05a9ce5d7f35 (patch) | |
tree | 2d0110f9ce614c2cd6a489659c0433187825869b /openbsd-compat/openssl-compat.h | |
parent | 60565bcb5c26f38b9f1c0261c0608751979571d4 (diff) |
- djm@cvs.openbsd.org 2013/01/26 06:11:05
[Makefile.in acss.c acss.h cipher-acss.c cipher.c]
[openbsd-compat/openssl-compat.h]
remove ACSS, now that it is gone from libcrypto too
Diffstat (limited to 'openbsd-compat/openssl-compat.h')
-rw-r--r-- | openbsd-compat/openssl-compat.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h index 6c4d68def..e7439b4e7 100644 --- a/openbsd-compat/openssl-compat.h +++ b/openbsd-compat/openssl-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openssl-compat.h,v 1.23 2013/02/10 23:39:15 djm Exp $ */ | 1 | /* $Id: openssl-compat.h,v 1.24 2013/02/12 00:00:40 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> | 4 | * Copyright (c) 2005 Darren Tucker <dtucker@zip.com.au> |
@@ -96,16 +96,6 @@ void ssh_aes_ctr_iv(EVP_CIPHER_CTX *, int, u_char *, size_t); | |||
96 | #define EVP_X_STATE_LEN(evp) (evp).cipher->ctx_size | 96 | #define EVP_X_STATE_LEN(evp) (evp).cipher->ctx_size |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | #if !defined(EVP_CTRL_SET_ACSS_MODE) | ||
100 | # if (OPENSSL_VERSION_NUMBER >= 0x00907000L) | ||
101 | # define USE_CIPHER_ACSS 1 | ||
102 | extern const EVP_CIPHER *evp_acss(void); | ||
103 | # define EVP_acss evp_acss | ||
104 | # else | ||
105 | # define EVP_acss NULL | ||
106 | # endif | ||
107 | #endif | ||
108 | |||
109 | /* OpenSSL 0.9.8e returns cipher key len not context key len */ | 99 | /* OpenSSL 0.9.8e returns cipher key len not context key len */ |
110 | #if (OPENSSL_VERSION_NUMBER == 0x0090805fL) | 100 | #if (OPENSSL_VERSION_NUMBER == 0x0090805fL) |
111 | # define EVP_CIPHER_CTX_key_length(c) ((c)->key_len) | 101 | # define EVP_CIPHER_CTX_key_length(c) ((c)->key_len) |