From: Robbie Harwood <rharwood@redhat.com>
Date: Mon, 24 May 2021 21:11:53 +0000 (-0400)
Subject: Update krb5 module and re-enable pkinit tests
X-Git-Tag: openssl-3.0.0-beta1~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3eb4b5bfe66ba0911fffa05ff1e3a00f4c54d641;p=thirdparty%2Fopenssl.git

Update krb5 module and re-enable pkinit tests

pkinit tests were disabled in cd0aca532091de4dfadf2f12b18dd99e9cba7615

Signed-off-by: Robbie Harwood <rharwood@redhat.com>

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15444)
---

diff --git a/krb5 b/krb5
index 3195e18f660..d6bf4227967 160000
--- a/krb5
+++ b/krb5
@@ -1 +1 @@
-Subproject commit 3195e18f6608890866cf7a60ea538f4649d4fe82
+Subproject commit d6bf42279675100e3e4fe7c6e08eef74d49624cb
diff --git a/test/recipes/95-test_external_krb5_data/krb5.sh b/test/recipes/95-test_external_krb5_data/krb5.sh
index 6a6664c0ce9..eeaa59f9610 100755
--- a/test/recipes/95-test_external_krb5_data/krb5.sh
+++ b/test/recipes/95-test_external_krb5_data/krb5.sh
@@ -13,7 +13,7 @@ CFLAGS="-I`pwd`/$BLDTOP/include -I`pwd`/$SRCTOP/include"
 
 cd $SRCTOP/krb5/src
 autoreconf
-./configure --with-ldap --with-prng-alg=os --disable-pkinit \
+./configure --with-ldap --with-prng-alg=os --enable-pkinit \
             --with-crypto-impl=openssl --with-tls-impl=openssl \
             CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"