aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Buehler <tb@openbsd.org>2023-05-25 07:45:11 +0200
committerTheo Buehler <tb@openbsd.org>2023-05-25 07:46:35 +0200
commit505e1ca787ce14273bcc38207d9499e0b495ea56 (patch)
treec73b89c575b58910a9f358f52f3f536222b394a8
parent42dff66511fc63e7461f3043c49f1c90f3b5115b (diff)
downloadportable-505e1ca787ce14273bcc38207d9499e0b495ea56.tar.gz
portable-505e1ca787ce14273bcc38207d9499e0b495ea56.tar.bz2
portable-505e1ca787ce14273bcc38207d9499e0b495ea56.zip
Remove patch that was merged into stable
-rw-r--r--patches/x509_genn.c.diff17
-rwxr-xr-xupdate.sh2
2 files changed, 0 insertions, 19 deletions
diff --git a/patches/x509_genn.c.diff b/patches/x509_genn.c.diff
deleted file mode 100644
index 1c6ea8c..0000000
--- a/patches/x509_genn.c.diff
+++ /dev/null
@@ -1,17 +0,0 @@
1Index: lib/libcrypto/x509/x509_genn.c
2===================================================================
3RCS file: /cvs/src/lib/libcrypto/x509/x509_genn.c,v
4retrieving revision 1.2
5diff -u -p -r1.2 x509_genn.c
6--- lib/libcrypto/x509/x509_genn.c 8 Dec 2020 15:06:42 -0000 1.2
7+++ lib/libcrypto/x509/x509_genn.c 24 Jan 2023 09:43:06 -0000
8@@ -366,7 +366,8 @@ GENERAL_NAME_cmp(GENERAL_NAME *a, GENERA
9 return -1;
10 switch (a->type) {
11 case GEN_X400:
12- result = ASN1_TYPE_cmp(a->d.x400Address, b->d.x400Address);
13+ result = ASN1_STRING_cmp((ASN1_STRING *)a->d.x400Address,
14+ (ASN1_STRING *)b->d.x400Address);
15 break;
16
17 case GEN_EDIPARTY:
diff --git a/update.sh b/update.sh
index 64f7189..3aea129 100755
--- a/update.sh
+++ b/update.sh
@@ -358,8 +358,6 @@ fi
358for i in patches/*.patch; do 358for i in patches/*.patch; do
359 $PATCH -p0 < $i 359 $PATCH -p0 < $i
360done 360done
361(cd crypto
362$PATCH -p2 < ../patches/x509_genn.c.diff)
363 361
364# copy manpages 362# copy manpages
365echo "copying manpages" 363echo "copying manpages"