diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-04-14 15:12:52 +0200 |
|---|---|---|
| committer | Benjamin Kaduk <bkaduk@akamai.com> | 2021-04-19 20:46:39 +0200 |
| commit | cd0aca532091de4dfadf2f12b18dd99e9cba7615 (patch) | |
| tree | 405670ae8138b800ca55ffa5bcd96a3957d447a7 | |
| parent | PKCS12 etc.: Add hints on using -legacy and -provider-path options (diff) | |
| download | openssl-cd0aca532091de4dfadf2f12b18dd99e9cba7615.tar.xz openssl-cd0aca532091de4dfadf2f12b18dd99e9cba7615.zip | |
Update krb5 module to latest release
Fixes #14902
Also add workaround of `sudo hostname localhost` for the
intermittent test failures seen in CI.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/14872)
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| m--------- | krb5 | 0 | ||||
| -rw-r--r-- | test/recipes/95-test_external_krb5.t | 2 | ||||
| -rwxr-xr-x | test/recipes/95-test_external_krb5_data/krb5.sh | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee4a2c8f2b..ec35e84ff3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -221,6 +221,8 @@ jobs: uses: perl-actions/install-with-cpanm@v1 with: install: Test2::V0 + - name: setup hostname workaround + run: sudo hostname localhost - name: config run: ./config --strict-warnings --debug no-afalgeng enable-rc5 enable-md2 enable-ssl3 enable-ssl3-method enable-weak-ssl-ciphers enable-zlib enable-ec_nistp_64_gcc_128 enable-external-tests && perl configdata.pm --dump - name: make diff --git a/krb5 b/krb5 -Subproject 890ca2f401924cdcb88f493950b04700bbe52db +Subproject 3195e18f6608890866cf7a60ea538f4649d4fe8 diff --git a/test/recipes/95-test_external_krb5.t b/test/recipes/95-test_external_krb5.t index dca2c065d3..9b8067d5d1 100644 --- a/test/recipes/95-test_external_krb5.t +++ b/test/recipes/95-test_external_krb5.t @@ -17,7 +17,7 @@ setup("test_external_krb5"); plan skip_all => "No external tests in this configuration" if disabled("external-tests"); plan skip_all => "krb5 not available" - if ! -f srctop_file("krb5", "src", "configure.in"); + if ! -f srctop_file("krb5", "src", "configure.ac"); plan tests => 1; diff --git a/test/recipes/95-test_external_krb5_data/krb5.sh b/test/recipes/95-test_external_krb5_data/krb5.sh index 6b267242f7..4c901bebf7 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 --enable-pkinit \ +./configure --with-ldap --with-prng-alg=os --disable-pkinit \ --with-crypto-impl=openssl --with-tls-impl=openssl \ CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" |