From 3b7da82a90b4cf9d37804b14e4fdfd161fe4eb60 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 10 Jan 2023 13:22:52 +0000
Subject: [PATCH] update to p5-Crypt-OpenSSL-RSA-0.33

---
 security/p5-Crypt-OpenSSL-RSA/Makefile        |  2 +-
 security/p5-Crypt-OpenSSL-RSA/distinfo        |  4 +-
 .../p5-Crypt-OpenSSL-RSA/patches/patch-RSA_xs | 68 -------------------
 3 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 security/p5-Crypt-OpenSSL-RSA/patches/patch-RSA_xs

diff --git a/security/p5-Crypt-OpenSSL-RSA/Makefile b/security/p5-Crypt-OpenSSL-RSA/Makefile
index d73b1e676d3..f6b8acd218f 100644
--- a/security/p5-Crypt-OpenSSL-RSA/Makefile
+++ b/security/p5-Crypt-OpenSSL-RSA/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	RSA encoding and decoding using OpenSSL
 
-DISTNAME =	Crypt-OpenSSL-RSA-0.32
+DISTNAME =	Crypt-OpenSSL-RSA-0.33
 
 CATEGORIES =	security
 
diff --git a/security/p5-Crypt-OpenSSL-RSA/distinfo b/security/p5-Crypt-OpenSSL-RSA/distinfo
index f49e966de1d..afdf4a0d498 100644
--- a/security/p5-Crypt-OpenSSL-RSA/distinfo
+++ b/security/p5-Crypt-OpenSSL-RSA/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Crypt-OpenSSL-RSA-0.32.tar.gz) = rcdPCuElx39l1d0yq7nDQpMAp5VDvyY0lPMz+cC2KmE=
-SIZE (Crypt-OpenSSL-RSA-0.32.tar.gz) = 24805
+SHA256 (Crypt-OpenSSL-RSA-0.33.tar.gz) = vb5jD21vVAMldGrZmXcnKshmT/gb0Z8K2rptb0Xv2GQ=
+SIZE (Crypt-OpenSSL-RSA-0.33.tar.gz) = 29010
diff --git a/security/p5-Crypt-OpenSSL-RSA/patches/patch-RSA_xs b/security/p5-Crypt-OpenSSL-RSA/patches/patch-RSA_xs
deleted file mode 100644
index 327b559789c..00000000000
--- a/security/p5-Crypt-OpenSSL-RSA/patches/patch-RSA_xs
+++ /dev/null
@@ -1,68 +0,0 @@
-Fix build with opaque RSA in LibreSSL 3.5.
-
-Index: RSA.xs
---- RSA.xs.orig
-+++ RSA.xs
-@@ -50,7 +50,7 @@ void croakSsl(char* p_file, int p_line)
- char _is_private(rsaData* p_rsa)
- {
-     const BIGNUM *d;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     d = p_rsa->rsa->d;
- #else
-     RSA_get0_key(p_rsa->rsa, NULL, NULL, &d);
-@@ -357,7 +357,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
-         croak("At least a modulus and public key must be provided");
-     }
-     CHECK_OPEN_SSL(rsa = RSA_new());
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     rsa->n = n;
-     rsa->e = e;
- #endif
-@@ -375,7 +375,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
-             q = BN_new();
-             THROW(BN_div(q, NULL, n, p, ctx));
-         }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         rsa->p = p;
-         rsa->q = q;
- #else
-@@ -391,7 +391,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
-             THROW(BN_mul(d, p_minus_1, q_minus_1, ctx));
-             THROW(BN_mod_inverse(d, e, d, ctx));
-         }
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         rsa->d = d;
- #else
-         THROW(RSA_set0_key(rsa, n, e, d));
-@@ -402,7 +402,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
-         THROW(BN_mod(dmq1, d, q_minus_1, ctx));
-         THROW(iqmp = BN_new());
-         THROW(BN_mod_inverse(iqmp, q, p, ctx));
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         rsa->dmp1 = dmp1;
-         rsa->dmq1 = dmq1;
-         rsa->iqmp = iqmp;
-@@ -426,7 +426,7 @@ _new_key_from_parameters(proto, n, e, d, p, q)
-     }
-     else
-     {
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-         rsa->d = d;
- #else
-         CHECK_OPEN_SSL(RSA_set0_key(rsa, n, e, d));
-@@ -453,7 +453,7 @@ PPCODE:
- {
-     RSA* rsa;
-     rsa = p_rsa->rsa;
--#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined LIBRESSL_VERSION_NUMBER
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
-     n = rsa->n;
-     e = rsa->e;
-     d = rsa->d;