ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Workaround LibreSSL 2.7.0-2.7.2 quirk in DH_set0_key

Browse Source 
(cherry picked from commit 6b9e3b7b06)
This commit is contained in:
Ondřej Surý
2018-05-03 14:27:33 +02:00
parent f3414c74ec
commit c74decdf53
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/dns/openssldh_link.c
+10
View File
@@ -44,6 +44,8 @@
#include <dst/result.h>
#include <openssl/opensslv.h>
#include "dst_internal.h"
#include "dst_openssl.h"
#include "dst_parse.h"
@@ -564,7 +566,15 @@ openssldh_fromdns(dst_key_t *key, isc_buffer_t *data) {
DH_free(dh);
return (dst__openssl_toresult(ISC_R_NOMEMORY));
}
#if (LIBRESSL_VERSION_NUMBER >= 0x2070000fL) && (LIBRESSL_VERSION_NUMBER <= 0x2070200fL)
/*
* LibreSSL << 2.7.3 DH_get0_key requires priv_key to be set when
* DH structure is empty, hence we cannot use DH_get0_key().
*/
dh->pub_key = pub_key;
#else /* LIBRESSL_VERSION_NUMBER */
DH_set0_key(dh, pub_key, NULL);
#endif /* LIBRESSL_VERSION_NUMBER */
isc_region_consume(&r, publen);
key->key_size = BN_num_bits(p);