summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_cert.c
diff options
context:
space:
mode:
authortb <>2022-07-07 13:04:39 +0000
committertb <>2022-07-07 13:04:39 +0000
commit5e009dfe713c55ed16e6f4732b2c8b5931265537 (patch)
tree422ab320b32995a12bf5eaa4242be365549ec73e /src/lib/libssl/ssl_cert.c
parent014c4b9a93d4ce98e8161197494a805e095e70fc (diff)
downloadopenbsd-5e009dfe713c55ed16e6f4732b2c8b5931265537.tar.gz
openbsd-5e009dfe713c55ed16e6f4732b2c8b5931265537.tar.bz2
openbsd-5e009dfe713c55ed16e6f4732b2c8b5931265537.zip
Unifdef LIBRESSL_HAS_SECURITY_LEVEL and remove some workarounds
that are no longer needed now that libcrypto exposes the necessary security-bits API. ok jsing
Diffstat (limited to 'src/lib/libssl/ssl_cert.c')
-rw-r--r--src/lib/libssl/ssl_cert.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/lib/libssl/ssl_cert.c b/src/lib/libssl/ssl_cert.c
index fc45e6b10d..453d75771d 100644
--- a/src/lib/libssl/ssl_cert.c
+++ b/src/lib/libssl/ssl_cert.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_cert.c,v 1.102 2022/07/02 19:36:07 jsing Exp $ */ 1/* $OpenBSD: ssl_cert.c,v 1.103 2022/07/07 13:04:39 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -170,11 +170,7 @@ ssl_cert_new(void)
170 } 170 }
171 ret->key = &(ret->pkeys[SSL_PKEY_RSA]); 171 ret->key = &(ret->pkeys[SSL_PKEY_RSA]);
172 ret->references = 1; 172 ret->references = 1;
173#if defined(LIBRESSL_HAS_SECURITY_LEVEL)
174 ret->security_cb = ssl_security_default_cb; 173 ret->security_cb = ssl_security_default_cb;
175#else
176 ret->security_cb = ssl_security_dummy_cb;
177#endif
178 ret->security_level = OPENSSL_TLS_SECURITY_LEVEL; 174 ret->security_level = OPENSSL_TLS_SECURITY_LEVEL;
179 ret->security_ex_data = NULL; 175 ret->security_ex_data = NULL;
180 return (ret); 176 return (ret);
@@ -426,9 +422,7 @@ ssl_verify_cert_chain(SSL *s, STACK_OF(X509) *certs)
426 422
427 param = X509_STORE_CTX_get0_param(ctx); 423 param = X509_STORE_CTX_get0_param(ctx);
428 424
429#if defined(LIBRESSL_HAS_SECURITY_LEVEL)
430 X509_VERIFY_PARAM_set_auth_level(param, SSL_get_security_level(s)); 425 X509_VERIFY_PARAM_set_auth_level(param, SSL_get_security_level(s));
431#endif
432 426
433 /* 427 /*
434 * Anything non-default in "param" should overwrite anything 428 * Anything non-default in "param" should overwrite anything