[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  3eb4b5bfe66ba0911fffa05ff1e3a00f4c54d641 (commit)
      from  67eacb60a8a46b610b98533c7e8ae5bd199e49d7 (commit)


- Log -----------------------------------------------------------------
commit 3eb4b5bfe66ba0911fffa05ff1e3a00f4c54d641
Author: Robbie Harwood <rharwood at redhat.com>
Date:   Mon May 24 17:11:53 2021 -0400

    Update krb5 module and re-enable pkinit tests
    
    pkinit tests were disabled in cd0aca532091de4dfadf2f12b18dd99e9cba7615
    
    Signed-off-by: Robbie Harwood <rharwood at redhat.com>
    
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15444)

-----------------------------------------------------------------------

Summary of changes:
 krb5                                            | 2 +-
 test/recipes/95-test_external_krb5_data/krb5.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/krb5 b/krb5
index 3195e18f66..d6bf422796 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 6a6664c0ce..eeaa59f961 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"