Attachment 200157 Details for Bug 234064 – WIP patch

[patch] WIP patch

krb5-libressl2.9.patch (text/plain), 2.98 KB, created by Charlie Li on 2018-12-16 16:59:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Charlie Li

Created: 2018-12-16 16:59:23 UTC

Size: 2.98 KB

patch

obsolete

># HG changeset patch
># User Charlie Li <ml+freebsd@vishwin.info>
># Date 1544979128 18000
>#      Sun Dec 16 11:52:08 2018 -0500
># Node ID af55bb66f97bbfd22630f81fe0ba947993590b2d
># Parent  7748e92b632e5fffe9b2bf34531963e835055397
>security/krb5: WIP fix build with libressl 2.9
>
>diff -r 7748e92b632e -r af55bb66f97b security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c
>--- a/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c	Sun Dec 16 14:59:10 2018 +0000
>+++ b/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.c	Sun Dec 16 11:52:08 2018 -0500
>@@ -1,6 +1,6 @@
>---- plugins/preauth/pkinit/pkinit_crypto_openssl.c.orig	2018-05-03 07:34:47.000000000 -0700
>-+++ plugins/preauth/pkinit/pkinit_crypto_openssl.c	2018-06-12 18:38:30.978823000 -0700
>-@@ -188,7 +188,8 @@
>+--- 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);
>      (*_x509_pp) = PKCS7_cert_from_signer_info(_p7,_si)
>  #endif
>  
>@@ -10,13 +10,14 @@
>  
>  /* 1.1 standardizes constructor and destructor names, renaming
>   * EVP_MD_CTX_{create,destroy} and deprecating ASN1_STRING_data. */
>-@@ -3040,7 +3041,8 @@
>+@@ -3040,7 +3041,9 @@ cleanup:
>      return retval;
>  }
>  
> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>-+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
>-+     !defined(LIBRESSL_VERSION_NUMBER)
>++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
>++     !defined(LIBRESSL_VERSION_NUMBER)) || \
>++     (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L)
>  
>  /*
>   * We need to decode DomainParameters from RFC 3279 section 2.3.3.  We would
>diff -r 7748e92b632e -r af55bb66f97b security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h
>--- a/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h	Sun Dec 16 14:59:10 2018 +0000
>+++ b/security/krb5-116/files/patch-plugins_preauth_pkinit_pkinit__crypto__openssl.h	Sun Dec 16 11:52:08 2018 -0500
>@@ -1,12 +1,13 @@
>---- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig	2018-05-03 07:34:47.000000000 -0700
>-+++ plugins/preauth/pkinit/pkinit_crypto_openssl.h	2018-06-12 18:35:23.603366000 -0700
>-@@ -46,7 +46,8 @@
>+--- plugins/preauth/pkinit/pkinit_crypto_openssl.h.orig	2018-11-01 23:51:07 UTC
>++++ plugins/preauth/pkinit/pkinit_crypto_openssl.h
>+@@ -46,7 +46,9 @@
>  #include <openssl/asn1.h>
>  #include <openssl/pem.h>
>  
> -#if OPENSSL_VERSION_NUMBER >= 0x10100000L
>-+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
>-+     !defined(LIBRESSL_VERSION_NUMBER)
>++#if ((defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L) && \
>++     !defined(LIBRESSL_VERSION_NUMBER)) || \
>++     (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20900000L)
>  #include <openssl/asn1t.h>
>  #else
>  #include <openssl/asn1_mac.h>

Actions: View | Diff

Attachments on bug 234064: 200157