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

MFH: r500725

Browse Source 
Fix build with libressl 2.9.1.

PR:		237621
Reported by:	many
Approved by:	portmgr (joneum@)
This commit is contained in:
Cy Schubert 2019-05-07 17:37:13 +00:00
parent 6a33e399b3
commit d198399857
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/branches/2019Q2/; revision=500972
4 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
security/krb5-115/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
View File

@ -1,6 +1,6 @@
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err);
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2019-01-08 08:02:37.000000000 -0800
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-02 12:18:53.494194000 -0700
@@ -189,7 +189,8 @@
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
@ -10,7 +10,18 @@
/* 1.1 standardizes constructor and destructor names, renaming
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
@@ -3040,7 +3041,9 @@ cleanup:
@@ -249,6 +250,10 @@
#endif
+#if defined(LIBRESSL_VERSION_NUMBER) && !defined(static_ASN1_SEQUENCE_END_name)
+#define static_ASN1_SEQUENCE_END_name ASN1_SEQUENCE_END_name
+#endif
+
static struct pkcs11_errstrings {
short code;
char *text;
@@ -3053,7 +3058,9 @@
return retval;
}

19
security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
View File

@ -1,6 +1,6 @@
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err);
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2019-01-08 08:02:37.000000000 -0800
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-02 12:18:53.494194000 -0700
@@ -189,7 +189,8 @@
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
@ -10,7 +10,18 @@
/* 1.1 standardizes constructor and destructor names, renaming
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
@@ -3040,7 +3041,9 @@ cleanup:
@@ -249,6 +250,10 @@
#endif
+#if defined(LIBRESSL_VERSION_NUMBER) && !defined(static_ASN1_SEQUENCE_END_name)
+#define static_ASN1_SEQUENCE_END_name ASN1_SEQUENCE_END_name
+#endif
+
static struct pkcs11_errstrings {
short code;
char *text;
@@ -3053,7 +3058,9 @@
return retval;
}

19
security/krb5-117/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
View File

@ -1,6 +1,6 @@
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err);
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2019-01-08 08:02:37.000000000 -0800
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-02 12:18:53.494194000 -0700
@@ -189,7 +189,8 @@
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
@ -10,7 +10,18 @@
/* 1.1 standardizes constructor and destructor names, renaming
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
@@ -3040,7 +3041,9 @@ cleanup:
@@ -249,6 +250,10 @@
#endif
+#if defined(LIBRESSL_VERSION_NUMBER) && !defined(static_ASN1_SEQUENCE_END_name)
+#define static_ASN1_SEQUENCE_END_name ASN1_SEQUENCE_END_name
+#endif
+
static struct pkcs11_errstrings {
short code;
char *text;
@@ -3053,7 +3058,9 @@
return retval;
}

19
security/krb5-devel/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
View File

@ -1,6 +1,6 @@
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2018-11-01 23:51:07 UTC
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c
@@ -188,7 +188,8 @@ pkinit_pkcs11_code_to_text(int err);
--- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig 2019-01-08 08:02:37.000000000 -0800
+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c 2019-05-02 12:18:53.494194000 -0700
@@ -189,7 +189,8 @@
(*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
#endif
@ -10,7 +10,18 @@
/* 1.1 standardizes constructor and destructor names, renaming
* EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
@@ -3040,7 +3041,9 @@ cleanup:
@@ -249,6 +250,10 @@
#endif
+#if defined(LIBRESSL_VERSION_NUMBER) && !defined(static_ASN1_SEQUENCE_END_name)
+#define static_ASN1_SEQUENCE_END_name ASN1_SEQUENCE_END_name
+#endif
+
static struct pkcs11_errstrings {
short code;
char *text;
@@ -3053,7 +3058,9 @@
return retval;
}