diff options
| author | tb <> | 2025-07-09 17:48:02 +0000 |
|---|---|---|
| committer | tb <> | 2025-07-09 17:48:02 +0000 |
| commit | aff293dbd9cfabda512ac59dac94bc93acbffc74 (patch) | |
| tree | 0c48b6ef031fc1c0c17d6d000d3d073d275a57db /src/regress/lib/libssl/interop/cipher | |
| parent | 8fa494c0b926ee98f0b8e37de072d325cb5a4810 (diff) | |
| download | openbsd-aff293dbd9cfabda512ac59dac94bc93acbffc74.tar.gz openbsd-aff293dbd9cfabda512ac59dac94bc93acbffc74.tar.bz2 openbsd-aff293dbd9cfabda512ac59dac94bc93acbffc74.zip | |
libcrypto regress: add interop harness for openssl/3.5
Diffstat (limited to 'src/regress/lib/libssl/interop/cipher')
| -rw-r--r-- | src/regress/lib/libssl/interop/cipher/Makefile | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/regress/lib/libssl/interop/cipher/Makefile b/src/regress/lib/libssl/interop/cipher/Makefile index fa7e25f9ee..6693b962d0 100644 --- a/src/regress/lib/libssl/interop/cipher/Makefile +++ b/src/regress/lib/libssl/interop/cipher/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # $OpenBSD: Makefile,v 1.17 2025/01/15 10:54:17 tb Exp $ | 1 | # $OpenBSD: Makefile,v 1.18 2025/07/09 17:48:02 tb Exp $ |
| 2 | 2 | ||
| 3 | # Connect a client to a server. Both can be current libressl, or | 3 | # Connect a client to a server. Both can be current libressl, or |
| 4 | # openssl 1.1 or 3.0. Create lists of supported ciphers | 4 | # openssl 1.1 or 3.0. Create lists of supported ciphers |
| @@ -13,6 +13,9 @@ LIBRARIES += openssl33 | |||
| 13 | .if exists(/usr/local/bin/eopenssl34) | 13 | .if exists(/usr/local/bin/eopenssl34) |
| 14 | LIBRARIES += openssl34 | 14 | LIBRARIES += openssl34 |
| 15 | .endif | 15 | .endif |
| 16 | .if exists(/usr/local/bin/eopenssl35) | ||
| 17 | LIBRARIES += openssl35 | ||
| 18 | .endif | ||
| 16 | 19 | ||
| 17 | CLEANFILES = *.tmp *.ciphers ciphers.mk | 20 | CLEANFILES = *.tmp *.ciphers ciphers.mk |
| 18 | 21 | ||
| @@ -42,7 +45,8 @@ client-${clib}-server-${slib}.ciphers: \ | |||
| 42 | # we are only interested in ciphers supported by libressl | 45 | # we are only interested in ciphers supported by libressl |
| 43 | sort $@ client-libressl.ciphers >$@.tmp | 46 | sort $@ client-libressl.ciphers >$@.tmp |
| 44 | . if "${clib}" == "openssl33" || "${slib}" == "openssl33" || \ | 47 | . if "${clib}" == "openssl33" || "${slib}" == "openssl33" || \ |
| 45 | "${clib}" == "openssl34" || "${slib}" == "openssl34" | 48 | "${clib}" == "openssl34" || "${slib}" == "openssl34" || \ |
| 49 | "${clib}" == "openssl35" || "${slib}" == "openssl35" | ||
| 46 | # OpenSSL's SSL_CTX_set_cipher_list doesn't accept TLSv1.3 ciphers | 50 | # OpenSSL's SSL_CTX_set_cipher_list doesn't accept TLSv1.3 ciphers |
| 47 | sed -i '/^TLS_/d' $@.tmp | 51 | sed -i '/^TLS_/d' $@.tmp |
| 48 | . endif | 52 | . endif |
| @@ -72,6 +76,7 @@ regress: ciphers.mk | |||
| 72 | LEVEL_libressl = | 76 | LEVEL_libressl = |
| 73 | LEVEL_openssl33 = ,@SECLEVEL=0 | 77 | LEVEL_openssl33 = ,@SECLEVEL=0 |
| 74 | LEVEL_openssl34 = ,@SECLEVEL=0 | 78 | LEVEL_openssl34 = ,@SECLEVEL=0 |
| 79 | LEVEL_openssl35 = ,@SECLEVEL=0 | ||
| 75 | 80 | ||
| 76 | .for clib in ${LIBRARIES} | 81 | .for clib in ${LIBRARIES} |
| 77 | .for slib in ${LIBRARIES} | 82 | .for slib in ${LIBRARIES} |
| @@ -132,7 +137,7 @@ check-cipher-${cipher}-client-${clib}-server-${slib}: \ | |||
| 132 | . endif | 137 | . endif |
| 133 | . if "${clib}" == "libressl" | 138 | . if "${clib}" == "libressl" |
| 134 | # libressl client may prefer chacha-poly if aes-ni is not supported | 139 | # libressl client may prefer chacha-poly if aes-ni is not supported |
| 135 | . if "${slib}" == "openssl33" || "${slib}" == "openssl34" | 140 | . if "${slib}" == "openssl33" || "${slib}" == "openssl34" || "${slib}" == "openssl35" |
| 136 | egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out | 141 | egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out |
| 137 | . else | 142 | . else |
| 138 | egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out | 143 | egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out |
