mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-07-30 16:26:33 +08:00
Merge d71663b3a2e0d80f7e39e82ec12f62441d9f5ae6 into 3bb373867917b674265067cbd38b9d252c43d014
This commit is contained in:
commit
3e2e2535ca
@ -373,6 +373,30 @@ add_openssl_ciphersuites()
|
||||
"
|
||||
;;
|
||||
|
||||
"ECDH")
|
||||
if [ `minor_ver "$MODE"` -ge 3 ]
|
||||
then
|
||||
M_CIPHERS="$M_CIPHERS \
|
||||
TLS-ECDH-RSA-WITH-AES-256-GCM-SHA384 \
|
||||
TLS-ECDH-RSA-WITH-AES-256-CBC-SHA384 \
|
||||
TLS-ECDH-RSA-WITH-AES-256-CBC-SHA \
|
||||
TLS-ECDH-RSA-WITH-AES-128-GCM-SHA256 \
|
||||
TLS-ECDH-RSA-WITH-AES-128-CBC-SHA256 \
|
||||
TLS-ECDH-RSA-WITH-AES-128-CBC-SHA \
|
||||
TLS-ECDH-RSA-WITH-3DES-EDE-CBC-SHA \
|
||||
"
|
||||
O_CIPHERS="$O_CIPHERS \
|
||||
ECDH-RSA-AES256-GCM-SHA384 \
|
||||
ECDH-RSA-AES256-SHA384 \
|
||||
ECDH-RSA-AES256-SHA \
|
||||
ECDH-RSA-AES128-GCM-SHA256 \
|
||||
ECDH-RSA-AES128-SHA256 \
|
||||
ECDH-RSA-AES128-SHA \
|
||||
ECDH-RSA-DES-CBC3-SHA \
|
||||
"
|
||||
fi
|
||||
;;
|
||||
|
||||
"PSK")
|
||||
CIPHERS="$CIPHERS \
|
||||
TLS_ECDHE_PSK_WITH_CHACHA20_POLY1305_SHA256 \
|
||||
@ -484,6 +508,17 @@ add_mbedtls_ciphersuites()
|
||||
TLS_PSK_WITH_NULL_SHA \
|
||||
"
|
||||
;;
|
||||
|
||||
"ECDH")
|
||||
if [ `minor_ver "$MODE"` -ge 3 ]
|
||||
then
|
||||
M_CIPHERS="$M_CIPHERS
|
||||
TLS-ECDH-RSA-WITH-CAMELLIA-256-GCM-SHA384 \
|
||||
TLS-ECDH-RSA-WITH-CAMELLIA-256-CBC-SHA384 \
|
||||
TLS-ECDH-RSA-WITH-CAMELLIA-128-GCM-SHA256 \
|
||||
TLS-ECDH-RSA-WITH-CAMELLIA-128-CBC-SHA256 \
|
||||
"
|
||||
fi
|
||||
esac
|
||||
}
|
||||
|
||||
@ -638,6 +673,21 @@ setup_arguments()
|
||||
O_CLIENT_ARGS="$O_CLIENT_ARGS -psk 6162636465666768696a6b6c6d6e6f70"
|
||||
G_CLIENT_ARGS="$G_CLIENT_ARGS --pskusername Client_identity --pskkey=6162636465666768696a6b6c6d6e6f70"
|
||||
;;
|
||||
|
||||
"ECDH")
|
||||
M_SERVER_ARGS="$M_SERVER_ARGS crt_file=data_files/ecdh-test.crt key_file=data_files/ec_256_prv.pem"
|
||||
O_SERVER_ARGS="$O_SERVER_ARGS -cert data_files/ecdh-test.crt -key data_files/ec_256_prv.pem"
|
||||
|
||||
M_CLIENT_ARGS="$M_CLIENT_ARGS"
|
||||
O_CLIENT_ARGS="$O_CLIENT_ARGS"
|
||||
|
||||
if [ "X$VERIFY" = "XYES" ]; then
|
||||
M_CLIENT_ARGS="$M_CLIENT_ARGS crt_file=data_files/ecdh-test.crt key_file=data_files/ec_256_prv.pem"
|
||||
O_CLIENT_ARGS="$O_CLIENT_ARGS -cert data_files/ecdh-test.crt -key data_files/ec_256_prv.pem"
|
||||
else
|
||||
M_CLIENT_ARGS="$M_CLIENT_ARGS crt_file=none key_file=none"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
|
||||
15
tests/data_files/ecdh-test.crt
Normal file
15
tests/data_files/ecdh-test.crt
Normal file
@ -0,0 +1,15 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIICSDCCATCgAwIBAgIBATANBgkqhkiG9w0BAQsFADA7MQswCQYDVQQGEwJOTDER
|
||||
MA8GA1UEChMIUG9sYXJTU0wxGTAXBgNVBAMTEFBvbGFyU1NMIFRlc3QgQ0EwHhcN
|
||||
MDEwMTAxMDAwMDAwWhcNMzAxMjMxMjM1OTU5WjAAMFkwEwYHKoZIzj0CAQYIKoZI
|
||||
zj0DAQcDQgAEd3Jlb4FLOZJ51eHxeB+sbwmaPFyhsONTUYNLCLZeC1clkM2vj3aT
|
||||
YbzzSs/BHl4HToQmvd4Evm5lOUVElhfeRaNdMFswCQYDVR0TBAIwADAdBgNVHQ4E
|
||||
FgQUcC4jVW9GHGLvm/TMYy/FrSy84k8wHwYDVR0jBBgwFoAUtFrkpbPe0lL2udWm
|
||||
lQ/rPrzH/f8wDgYDVR0PAQH/BAQDAgEIMA0GCSqGSIb3DQEBCwUAA4IBAQCNNeiq
|
||||
MHGbd9NXm6ewQXNogEdTG7j1wE/dinKwTIhxZmQEWouClgkhTiXjzKhEmE5hYTr8
|
||||
tzLKGF6UjKUxhdD6c60eUG724k/QX4oENRRwiY4MNuYwm/523vaD4DakMoG6bPUp
|
||||
og5RodWaggbA3H23yP5ZLConKi8MdEJxNI2fWXLVOzo3vtuRZJcX/S7r3oH62etF
|
||||
dTWM3lpBz6I3nJd86nQwVdqc4pLpSPCXS/C/CkrtIzys9MLxxkWhMqNwNWc21V+w
|
||||
uCQIaEc/t0D/EDA8yVM3vOcvoG7ZhadHJ2s29hnvgwIN84QpP3auRmBv7IEPsk0P
|
||||
dKq9eeJLcbhu3WuX
|
||||
-----END CERTIFICATE-----
|
||||
Loading…
x
Reference in New Issue
Block a user