We don't really to keep history in constructs such as:

#if 1 /* new with openssl 0.9.4 */
current code;
#else
obsolete code;
#endif

2 files changed, 1 insertions, 12 deletions

diff --git a/lib/libcrypto/pem/pem.h b/lib/libcrypto/pem/pem.h
index 38469f02df3..6eae9345a1b 100644
--- a/lib/libcrypto/pem/pem.h
+++ b/lib/libcrypto/pem/pem.h
@@ -392,13 +392,7 @@ int PEM_write_bio_##name(BIO *bp, type *x, const EVP_CIPHER *enc, \
 	DECLARE_PEM_read(name, type) \
 	DECLARE_PEM_write_cb(name, type)
 
-#if 1
-/* "userdata": new with OpenSSL 0.9.4 */
 typedef int pem_password_cb(char *buf, int size, int rwflag, void *userdata);
-#else
-/* OpenSSL 0.9.3, 0.9.3a */
-typedef int pem_password_cb(char *buf, int size, int rwflag);
-#endif
 
 int	PEM_get_EVP_CIPHER_INFO(char *header, EVP_CIPHER_INFO *cipher);
 int	PEM_do_header (EVP_CIPHER_INFO *cipher, unsigned char *data, long *len,
diff --git a/lib/libssl/ssl_cert.c b/lib/libssl/ssl_cert.c
index f89fa13951a..d8b94b1285c 100644
--- a/lib/libssl/ssl_cert.c
+++ b/lib/libssl/ssl_cert.c
@@ -493,12 +493,7 @@ ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *sk)
 		X509_STORE_CTX_set_verify_cb(&ctx, s->verify_callback);
 
 	if (s->ctx->app_verify_callback != NULL)
-#if 1 /* new with OpenSSL 0.9.7 */
-	i = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg);
-
-#else
-	i=s->ctx->app_verify_callback(&ctx); /* should pass app_verify_arg */
-#endif
+		i = s->ctx->app_verify_callback(&ctx, s->ctx->app_verify_arg);
 	else {
 #ifndef OPENSSL_NO_X509_VERIFY
 		i = X509_verify_cert(&ctx);