Skip to content

Commit 1b419b9

Browse files
authored
Merge pull request #569 from botovq/libressl-evp-hkdf
Enable HKDF support for LibreSSL 3.6 and later
2 parents 17fb6f1 + 9bdd39a commit 1b419b9

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ext/openssl/ossl_kdf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (C) 2007, 2017 Ruby/OpenSSL Project Authors
44
*/
55
#include "ossl.h"
6-
#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
6+
#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 6, 0)
77
# include <openssl/kdf.h>
88
#endif
99

@@ -141,7 +141,7 @@ kdf_scrypt(int argc, VALUE *argv, VALUE self)
141141
}
142142
#endif
143143

144-
#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
144+
#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 6, 0)
145145
/*
146146
* call-seq:
147147
* KDF.hkdf(ikm, salt:, info:, length:, hash:) -> String
@@ -305,7 +305,7 @@ Init_ossl_kdf(void)
305305
#if defined(HAVE_EVP_PBE_SCRYPT)
306306
rb_define_module_function(mKDF, "scrypt", kdf_scrypt, -1);
307307
#endif
308-
#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined(LIBRESSL_VERSION_NUMBER)
308+
#if OSSL_OPENSSL_PREREQ(1, 1, 0) || OSSL_LIBRESSL_PREREQ(3, 6, 0)
309309
rb_define_module_function(mKDF, "hkdf", kdf_hkdf, -1);
310310
#endif
311311
}

0 commit comments

Comments
 (0)