diff options
| author | Theo Buehler <tb@cvs.openbsd.org> | 2022-02-05 18:21:10 +0000 |
|---|---|---|
| committer | Theo Buehler <tb@cvs.openbsd.org> | 2022-02-05 18:21:10 +0000 |
| commit | d9f4fdcbcf191ae47e5f9cfa86bb4e72f7794932 (patch) | |
| tree | 592529b6c1913a5aa25f718fc6bd68cf301bdb8b /regress/lib/libssl/interop | |
| parent | 538204f9d2cbca82fca72dc59028689dadd931dd (diff) | |
Mechanically adjust from AEAD- to TLS_ to adjust to the new cipher names.
Diffstat (limited to 'regress/lib/libssl/interop')
| -rw-r--r-- | regress/lib/libssl/interop/cipher/Makefile | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/regress/lib/libssl/interop/cipher/Makefile b/regress/lib/libssl/interop/cipher/Makefile index c88309962df..77ed0f7ebef 100644 --- a/regress/lib/libssl/interop/cipher/Makefile +++ b/regress/lib/libssl/interop/cipher/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2020/12/17 00:51:11 bluhm Exp $ +# $OpenBSD: Makefile,v 1.8 2022/02/05 18:21:09 tb Exp $ # Connect a client to a server. Both can be current libressl, or # openssl 1.0.2, or openssl 1.1. Create lists of supported ciphers @@ -133,11 +133,11 @@ check-cipher-${cipher}-client-${clib}-server-${slib}: \ client-cipher-${cipher}-client-${clib}-server-${slib}.out \ server-cipher-${cipher}-client-${clib}-server-${slib}.out .if "${clib}" != "openssl" && "${slib}" != "openssl" && \ - "${cipher:C/AEAD-(AES.*-GCM|CHACHA.*-POLY.*)-SHA.*/TLS1_3/}" != TLS1_3 + "${cipher:C/TLS_(AES.*_GCM|CHACHA.*_POLY.*)_SHA.*/TLS1_3/}" != TLS1_3 # client and server 1.3 capable, not TLS 1.3 cipher . if "${clib}" == "libressl" # libressl client may prefer chacha-poly if aes-ni is not supported - egrep -q ' Cipher *: AEAD-(AES256-GCM-SHA384|CHACHA20-POLY1305-SHA256)$$' ${@:S/^check/client/}.out + egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/client/}.out . else # openssl 1.1 generic client cipher grep -q ' Cipher *: TLS_AES_256_GCM_SHA384$$' ${@:S/^check/client/}.out @@ -147,16 +147,11 @@ check-cipher-${cipher}-client-${clib}-server-${slib}: \ . if "${slib}" == "openssl11" egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out . else - egrep -q ' Cipher *: AEAD-(AES256-GCM-SHA384|CHACHA20-POLY1305-SHA256)$$' ${@:S/^check/server/}.out + egrep -q ' Cipher *: TLS_(AES_256_GCM_SHA384|CHACHA20_POLY1305_SHA256)$$' ${@:S/^check/server/}.out . endif . else -. if "${slib}" == "openssl11" - # openssl 1.1 generic server cipher + # generic server cipher grep -q ' Cipher *: TLS_AES_256_GCM_SHA384$$' ${@:S/^check/server/}.out -. else - # libressl generic server cipher - grep -q ' Cipher *: AEAD-AES256-GCM-SHA384$$' ${@:S/^check/server/}.out -. endif . endif .else grep -q ' Cipher *: ${cipher}$$' ${@:S/^check/client/}.out |