cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

openssl-ruby-test: one more merged pull request. Hopefully last one

Browse Source 
for today, sorry for the noise.
This commit is contained in:
tb 2022-11-23 20:07:43 +00:00
parent 895f3cac6a
commit 70cb11e9fb
3 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/openssl-ruby-tests/Makefile
View File

@ -3,11 +3,11 @@ COMMENT = sources of the Ruby OpenSSL gem for regression testing
# Follows HEAD
VERSION = 20221123
DISTNAME = openssl-ruby-tests-${VERSION}
REVISION = 1
REVISION = 2
GH_ACCOUNT = ruby
GH_PROJECT = openssl
GH_COMMIT = 1b419b99af49c93300f64cd5214b07369ab92ffe
GH_COMMIT = f2311d535397debe3b1d0ebe1b96ed4add772cd5
CATEGORIES = security devel

4
security/openssl-ruby-tests/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openssl-ruby-tests-20221123-1b419b99.tar.gz) = yZrEGzokkJR3NwnzPor9FBaPTUsRC1V2qIbAk7gHfuM=
SIZE (openssl-ruby-tests-20221123-1b419b99.tar.gz) = 305103
SHA256 (openssl-ruby-tests-20221123-f2311d53.tar.gz) = C6ubbqUmNStqlxqom1n9T/yRmFo+OieMNIXwkFWr7x0=
SIZE (openssl-ruby-tests-20221123-f2311d53.tar.gz) = 304906

25
security/openssl-ruby-tests/patches/patch-ext_openssl_ossl_pkey_c
View File

@ -1,25 +0,0 @@
LibreSSL >= 3.4 has EVP_DigestSign() and EVP_DigestVerify()
https://github.com/ruby/openssl/pull/560
Index: ext/openssl/ossl_pkey.c
--- ext/openssl/ossl_pkey.c.orig
+++ ext/openssl/ossl_pkey.c
@@ -951,7 +951,7 @@ ossl_pkey_sign(int argc, VALUE *argv, VALUE self)
rb_jump_tag(state);
}
}
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OSSL_OPENSSL_PREREQ(1, 1, 1) || OSSL_LIBRESSL_PREREQ(3, 4, 0)
if (EVP_DigestSign(ctx, NULL, &siglen, (unsigned char *)RSTRING_PTR(data),
RSTRING_LEN(data)) < 1) {
EVP_MD_CTX_free(ctx);
@@ -1056,7 +1056,7 @@ ossl_pkey_verify(int argc, VALUE *argv, VALUE self)
rb_jump_tag(state);
}
}
-#if OPENSSL_VERSION_NUMBER >= 0x10101000 && !defined(LIBRESSL_VERSION_NUMBER)
+#if OSSL_OPENSSL_PREREQ(1, 1, 1) || OSSL_LIBRESSL_PREREQ(3, 4, 0)
ret = EVP_DigestVerify(ctx, (unsigned char *)RSTRING_PTR(sig),
RSTRING_LEN(sig), (unsigned char *)RSTRING_PTR(data),
RSTRING_LEN(data));