summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorTheo Buehler <tb@cvs.openbsd.org>2022-01-09 18:46:57 +0000
committerTheo Buehler <tb@cvs.openbsd.org>2022-01-09 18:46:57 +0000
commitcceca0ddf5d476fd12e390e0b63d29fd843dc45b (patch)
treec3edd59d634b537db4ce2112eef7a6deaab02d75 /usr.sbin
parent9ce21881534ec589d1ffbcd35bcc3ee9bbb208e5 (diff)
unwind/unbound: prepare for opaque DSA and RSA.
Use the OpenSSL 1.1 codepath using accessors that have been available since LibreSSL 2.7 instead of reaching into the structs. ok sthen
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/unbound/sldns/keyraw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/unbound/sldns/keyraw.c b/usr.sbin/unbound/sldns/keyraw.c
index b1e60d8b52a..a40f1e8601a 100644
--- a/usr.sbin/unbound/sldns/keyraw.c
+++ b/usr.sbin/unbound/sldns/keyraw.c
@@ -250,7 +250,7 @@ sldns_key_buf2dsa_raw(unsigned char* key, size_t len)
if(!(dsa = DSA_new())) {
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
+#if OPENSSL_VERSION_NUMBER < 0x10100000
#ifndef S_SPLINT_S
dsa->p = P;
dsa->q = Q;
@@ -428,7 +428,7 @@ sldns_key_buf2rsa_raw(unsigned char* key, size_t len)
BN_free(modulus);
return NULL;
}
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(HAVE_LIBRESSL)
+#if OPENSSL_VERSION_NUMBER < 0x10100000
#ifndef S_SPLINT_S
rsa->n = modulus;
rsa->e = exponent;