diff options
| author |   miod <miod@openbsd.org> | 2014-05-26 20:15:29 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-05-26 20:15:29 +0000 |
| commit | 1c24f8b11c23c2d2842bf1e9a9fe94186cd18278 (patch) | |
| tree | 0e216a6fa5c5f657a7674bd34acb11498f1189dd /lib/libssl/src | |
| parent | tls_decrypt_ticket(): memory leak and uncleaned EVP_CIPHER_CTX upon error. (diff) | |
| download | wireguard-openbsd-1c24f8b11c23c2d2842bf1e9a9fe94186cd18278.tar.xz wireguard-openbsd-1c24f8b11c23c2d2842bf1e9a9fe94186cd18278.zip | |
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
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/crypto/pem/pem.h | 6 | ||||
| -rw-r--r-- | lib/libssl/src/ssl/ssl_cert.c | 7 |
2 files changed, 1 insertions, 12 deletions
diff --git a/lib/libssl/src/crypto/pem/pem.h b/lib/libssl/src/crypto/pem/pem.h index 38469f02df3..6eae9345a1b 100644 --- a/lib/libssl/src/crypto/pem/pem.h +++ b/lib/libssl/src/crypto/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/src/ssl/ssl_cert.c b/lib/libssl/src/ssl/ssl_cert.c index f89fa13951a..d8b94b1285c 100644 --- a/lib/libssl/src/ssl/ssl_cert.c +++ b/lib/libssl/src/ssl/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); |