summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authordjm <djm>2013-02-12 00:00:34 +0000
committerdjm <djm>2013-02-12 00:00:34 +0000
commitbe3be500adf130a8105c76cfe69e201f788d9a01 (patch)
tree40f4a323656f8ddeabed2aaeaeff5d3207b53700 /openbsd-compat
parentfae6fb9ea63f88b998f60b39076b2de569c76c79 (diff)
downloadopenssh-be3be500adf130a8105c76cfe69e201f788d9a01.tar.gz
- 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')
-rw-r--r--openbsd-compat/openssl-compat.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/openbsd-compat/openssl-compat.h b/openbsd-compat/openssl-compat.h
index 6c4d68de..e7439b4e 100644
--- a/openbsd-compat/openssl-compat.h
+++ b/openbsd-compat/openssl-compat.h
@@ -1,4 +1,4 @@
-/* $Id: openssl-compat.h,v 1.23 2013/02/10 23:39:15 djm Exp $ */
+/* $Id: openssl-compat.h,v 1.24 2013/02/12 00:00:40 djm Exp $ */
/*
* 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);
#define EVP_X_STATE_LEN(evp) (evp).cipher->ctx_size
#endif
-#if !defined(EVP_CTRL_SET_ACSS_MODE)
-# if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
-# define USE_CIPHER_ACSS 1
-extern const EVP_CIPHER *evp_acss(void);
-# define EVP_acss evp_acss
-# else
-# define EVP_acss NULL
-# endif
-#endif
-
/* OpenSSL 0.9.8e returns cipher key len not context key len */
#if (OPENSSL_VERSION_NUMBER == 0x0090805fL)
# define EVP_CIPHER_CTX_key_length(c) ((c)->key_len)