Script to turn plain man pages into html now that we want to make html man

[gssapi-openssh.git] / openssh / openbsd-compat / openssl-compat.h

diff --git a/openssh/openbsd-compat/openssl-compat.h b/openssh/openbsd-compat/openssl-compat.h
index a37f1473a3ba44ea3d43017ea3ace6f324f6bbe2..eff0947312f295ed92f77b283eade82ea1c0b9fd 100644 (file)
--- a/openssh/openbsd-compat/openssl-compat.h
+++ b/openssh/openbsd-compat/openssl-compat.h
@@ -24,11 +24,7 @@
 # define EVP_CIPHER_CTX_get_app_data(e)                ((e)->app_data)
 #endif
 
-#if (OPENSSL_VERSION_NUMBER < 0x00907000L) || defined(OPENSSL_LOBOTOMISED_AES)
-# define USE_BUILTIN_RIJNDAEL
-#endif
-
-#ifdef USE_BUILTIN_RIJNDAEL
+#if OPENSSL_VERSION_NUMBER < 0x00907000L
 # define EVP_aes_128_cbc evp_rijndael
 # define EVP_aes_192_cbc evp_rijndael
 # define EVP_aes_256_cbc evp_rijndael
@@ -46,40 +42,24 @@ extern const EVP_CIPHER *evp_acss(void);
 # 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)
-#endif
-
 /*
- * We overload some of the OpenSSL crypto functions with ssh_* equivalents
- * which cater for older and/or less featureful OpenSSL version.
- *
- * In order for the compat library to call the real functions, it must
- * define SSH_DONT_OVERLOAD_OPENSSL_FUNCS before including this file and
- * implement the ssh_* equivalents.
+ * insert comment here
  */
-#ifndef SSH_DONT_OVERLOAD_OPENSSL_FUNCS
+#ifdef SSH_OLD_EVP
+
+# ifndef SSH_DONT_REDEF_EVP
 
-# ifdef SSH_OLD_EVP
 #  ifdef EVP_Cipher
 #   undef EVP_Cipher
 #  endif
+
 #  define EVP_CipherInit(a,b,c,d,e)    ssh_EVP_CipherInit((a),(b),(c),(d),(e))
 #  define EVP_Cipher(a,b,c,d)          ssh_EVP_Cipher((a),(b),(c),(d))
 #  define EVP_CIPHER_CTX_cleanup(a)    ssh_EVP_CIPHER_CTX_cleanup((a))
-# endif /* SSH_OLD_EVP */
-
-# ifdef USE_OPENSSL_ENGINE
-#  ifdef SSLeay_add_all_algorithms
-#   undef SSLeay_add_all_algorithms
-#  endif
-#  define SSLeay_add_all_algorithms()  ssh_SSLeay_add_all_algorithms()
-#endif
+# endif
 
 int ssh_EVP_CipherInit(EVP_CIPHER_CTX *, const EVP_CIPHER *, unsigned char *,
     unsigned char *, int);
 int ssh_EVP_Cipher(EVP_CIPHER_CTX *, char *, char *, int);
 int ssh_EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *);
-void ssh_SSLeay_add_all_algorithms(void);
-#endif /* SSH_DONT_OVERLOAD_OPENSSL_FUNCS */
+#endif