Skip to content

Commit d601f33

Browse files
drwetterdrwetter
committed
Merge branch '3.2' into new_Handshakes
2 parents 0d7c33a + bc0c9f9 commit d601f33

3 files changed

Lines changed: 49 additions & 0 deletions

File tree

‎etc/client-simulation.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,6 +3040,30 @@ names+=("Opera 66 (Win 10)")
30403040
requiresSha2+=(true)
30413041
current+=(true)
30423042

3043+
names+=("OpenSSL 3.5.0 (git)")
3044+
short+=("openssl_350")
3045+
ch_ciphers+=("ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA")
3046+
ciphersuites+=("TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256")
3047+
ch_sni+=("$SNI")
3048+
warning+=("")
3049+
handshakebytes+=("1603010602010005fe03031bd89c274749435718559a0608a56fe6ee4725b2dfd165b1761698b5d27ea516201c8f86d0ef4b0c10af240c1ef15e6371ca9d04279a51f42ab2b8fb710ce66ce6003c130213031301c02cc030009fcca9cca8ccaac02bc02f009ec024c028006bc023c0270067c00ac0140039c009c0130033009d009c003d003c0035002f01000579ff010001000000000f000d00000a7465737473736c2e7368000b000403000102000a0012001011ec001d0017001e0018001901000101002300000016000000170000000d0036003409050906090404030503060308070808081a081b081c0809080a080b080408050806040105010601030303010302040205020602002b00050403040303002d00020101003304ea04e811ec04c0a955159d00cc9029ccd63372160b3ae1380e24b075aaa91b311319a6e0b12f34b9843535a3c004a2a47be34b415728ad74630346c8770bac3ae5285e8bf31919c90c443b880ca88fa3039b4553aa57c038973ca70e7c1e10d4bbff4970dfaa92aec77361314950b3be0b40c92b1535ffb0a6fdd7450c4288b5097c8d61bd17a3408ccb6264a72d90f42b20c8cf1c4689eab0527a47532ca077af8b943db5c4ce1068b4545f19384c9d4b6595543890e811bf8b66b5394a18a7553da431ba4a7d58f409358825d2408ef95b67f976bb2ba6428db68ff6db3bcdd0cc687a79b66309478b47d4668d0552cd1495a65a2a43742a4da9a13b1511ca8af217dc59ad17d03fd8376dc8993d68c81cf034922012cf4550b770b80ecfa36ac82c3dca254c0c412fc76aa1e40b1a0f1187f282599503993b92c73e685e668a7dfe93167e12cf6754c5659b009f58a513d1b1eb81661eaaba57f84863884da3b47ffe339764d136f8332ec0ca5af6f18b0df92b01323d9dd9c687841283864358e102a2a8c7ecec5bd52a05b51696e78791e3116a08c7517274644309ae8f604b0f1cae867180b9e84e6ff44e9b0c95ff997b2cb07b90c8a793757ccc122abf21c34432c83c244f5fac1bbffc16a4c0456bd306a73585d15931880098504290d07a3024a19e52902b4366012e119dc61b0f62083d42d32e0c6ab09e6aa6a2fccf9169aa4b1491e37c8fd939b43435b4e8ccbfd7895e517c870114601c1b7fbf0b091ef46d3268aeebb43ad52aa0e538c83db04db30a0a6898b3919c34e8d050b86771a42691e06869898a43e0265d0bbb026955560c249e09e2027c045c46c1cb9bb773f3b63ec0f9c3856ac065d6c98e6115e791cb2d2b29b22c3fc69b3b691a86a93b0ead2020c6a350baf10d58e5199e2a70b734238a950baca53b29fc45ab279d18da9e3549c984a4929d641ff60ba2bd8549af9b5ccd484963022b6caa0b7e434a49f76722728703db0205f487fdb2607d52819ca7783f073dd3617562691d57397c1109ab178b473011c3324a234840b7bbc81a1a38705da44a920b1ac8bbc31549094a6935559351a2b0b20831091bb29574bb6e6f753e30c56caa8439037460e9a14bd775c54c83a1ea59768891630880735f98406065103173a78482ac73e406cd7536d740a44a1265368162c943b531a361165c56eb0070c3a63335661bc22827e3f1c22f059540623aa042712bb8363d62caf2d35b3ce2ceca8ab5a92032483627d4657bc57a9c315c2c7e048f05b27f5fc15d612c681803cf95d0aa9a0a5aa6fb9e1138269e8933b01b55a499c4645656f4c0aab83a66ad9690d6880625076055f3c73fea8cdea5cbea13638cdc20dd889cdce83ce77855b17a5ca7cc0d4964967c5349c165cbaf20a8f64ca67ad619e6617c1cc02c87d3aa5cbbc306594983d996ca71cd2f8a0c92a6428e6347f16c719f281496774aecf1ba38b58a397c873c01501d7c15a846aa472123c1b36fe9628b4ff92c381386aea6078f1511ab242f4810a019ba9cff754ead831c03f0693d2c443feb5314451db7632c92e6b2a1694ece5425244cba6fb96411694108d68e15c4323f3bce70622bd8b153b9ab7c35464b25033abc1827b6f40406dcb72181124614a7aa28ec85cdd972b966fe2a18bec37e022b994391c802136d4c45e71456cecca8c570b1d0997b9a42c31a0b001d00206027f8c9736f473e484816595da5ffd8ca654a866580a64d2451c47f5235ed31")
3050+
protos+=("-no_ssl3 -no_ssl2")
3051+
tlsvers+=("-tls1_3 -tls1_2")
3052+
lowest_protocol+=("0x0303")
3053+
highest_protocol+=("0x0304")
3054+
alpn+=("h2,http/1.1")
3055+
service+=("ANY")
3056+
minDhBits+=(2048)
3057+
maxDhBits+=(-1)
3058+
minRsaBits+=(2048)
3059+
maxRsaBits+=(-1)
3060+
minEcdsaBits+=(224)
3061+
curves+=("X25519MLKEM768:x25519:secp256r1:x448:secp384r1:secp521r1:ffdhe2048:ffdhe3072")
3062+
requiresSha2+=(true)
3063+
ja3+=("27718d56688425cd36a401c66147c4ee")
3064+
ja4+=("t13d301100_1d37bd780c83_8e6e362c5eac")
3065+
current+=(true)
3066+
30433067
names+=("Apple Mail (16.0)")
30443068
short+=("apple_mail_16_0")
30453069
ch_ciphers+=("ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA")

‎etc/client-simulation.wiresharked.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -663,6 +663,30 @@
663663
requiresSha2+=(true)
664664
current+=(true)
665665

666+
names+=("OpenSSL 3.5.0 (git)")
667+
short+=("openssl_350")
668+
ch_ciphers+=("ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA")
669+
ciphersuites+=("TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256")
670+
ch_sni+=("$SNI")
671+
warning+=("")
672+
handshakebytes+=("1603010602010005fe03031bd89c274749435718559a0608a56fe6ee4725b2dfd165b1761698b5d27ea516201c8f86d0ef4b0c10af240c1ef15e6371ca9d04279a51f42ab2b8fb710ce66ce6003c130213031301c02cc030009fcca9cca8ccaac02bc02f009ec024c028006bc023c0270067c00ac0140039c009c0130033009d009c003d003c0035002f01000579ff010001000000000f000d00000a7465737473736c2e7368000b000403000102000a0012001011ec001d0017001e0018001901000101002300000016000000170000000d0036003409050906090404030503060308070808081a081b081c0809080a080b080408050806040105010601030303010302040205020602002b00050403040303002d00020101003304ea04e811ec04c0a955159d00cc9029ccd63372160b3ae1380e24b075aaa91b311319a6e0b12f34b9843535a3c004a2a47be34b415728ad74630346c8770bac3ae5285e8bf31919c90c443b880ca88fa3039b4553aa57c038973ca70e7c1e10d4bbff4970dfaa92aec77361314950b3be0b40c92b1535ffb0a6fdd7450c4288b5097c8d61bd17a3408ccb6264a72d90f42b20c8cf1c4689eab0527a47532ca077af8b943db5c4ce1068b4545f19384c9d4b6595543890e811bf8b66b5394a18a7553da431ba4a7d58f409358825d2408ef95b67f976bb2ba6428db68ff6db3bcdd0cc687a79b66309478b47d4668d0552cd1495a65a2a43742a4da9a13b1511ca8af217dc59ad17d03fd8376dc8993d68c81cf034922012cf4550b770b80ecfa36ac82c3dca254c0c412fc76aa1e40b1a0f1187f282599503993b92c73e685e668a7dfe93167e12cf6754c5659b009f58a513d1b1eb81661eaaba57f84863884da3b47ffe339764d136f8332ec0ca5af6f18b0df92b01323d9dd9c687841283864358e102a2a8c7ecec5bd52a05b51696e78791e3116a08c7517274644309ae8f604b0f1cae867180b9e84e6ff44e9b0c95ff997b2cb07b90c8a793757ccc122abf21c34432c83c244f5fac1bbffc16a4c0456bd306a73585d15931880098504290d07a3024a19e52902b4366012e119dc61b0f62083d42d32e0c6ab09e6aa6a2fccf9169aa4b1491e37c8fd939b43435b4e8ccbfd7895e517c870114601c1b7fbf0b091ef46d3268aeebb43ad52aa0e538c83db04db30a0a6898b3919c34e8d050b86771a42691e06869898a43e0265d0bbb026955560c249e09e2027c045c46c1cb9bb773f3b63ec0f9c3856ac065d6c98e6115e791cb2d2b29b22c3fc69b3b691a86a93b0ead2020c6a350baf10d58e5199e2a70b734238a950baca53b29fc45ab279d18da9e3549c984a4929d641ff60ba2bd8549af9b5ccd484963022b6caa0b7e434a49f76722728703db0205f487fdb2607d52819ca7783f073dd3617562691d57397c1109ab178b473011c3324a234840b7bbc81a1a38705da44a920b1ac8bbc31549094a6935559351a2b0b20831091bb29574bb6e6f753e30c56caa8439037460e9a14bd775c54c83a1ea59768891630880735f98406065103173a78482ac73e406cd7536d740a44a1265368162c943b531a361165c56eb0070c3a63335661bc22827e3f1c22f059540623aa042712bb8363d62caf2d35b3ce2ceca8ab5a92032483627d4657bc57a9c315c2c7e048f05b27f5fc15d612c681803cf95d0aa9a0a5aa6fb9e1138269e8933b01b55a499c4645656f4c0aab83a66ad9690d6880625076055f3c73fea8cdea5cbea13638cdc20dd889cdce83ce77855b17a5ca7cc0d4964967c5349c165cbaf20a8f64ca67ad619e6617c1cc02c87d3aa5cbbc306594983d996ca71cd2f8a0c92a6428e6347f16c719f281496774aecf1ba38b58a397c873c01501d7c15a846aa472123c1b36fe9628b4ff92c381386aea6078f1511ab242f4810a019ba9cff754ead831c03f0693d2c443feb5314451db7632c92e6b2a1694ece5425244cba6fb96411694108d68e15c4323f3bce70622bd8b153b9ab7c35464b25033abc1827b6f40406dcb72181124614a7aa28ec85cdd972b966fe2a18bec37e022b994391c802136d4c45e71456cecca8c570b1d0997b9a42c31a0b001d00206027f8c9736f473e484816595da5ffd8ca654a866580a64d2451c47f5235ed31")
673+
protos+=("-no_ssl3 -no_ssl2")
674+
tlsvers+=("-tls1_3 -tls1_2")
675+
lowest_protocol+=("0x0303")
676+
highest_protocol+=("0x0304")
677+
alpn+=("h2,http/1.1")
678+
service+=("ANY")
679+
minDhBits+=(2048)
680+
maxDhBits+=(-1)
681+
minRsaBits+=(2048)
682+
maxRsaBits+=(-1)
683+
minEcdsaBits+=(224)
684+
curves+=("X25519MLKEM768:x25519:secp256r1:x448:secp384r1:secp521r1:ffdhe2048:ffdhe3072")
685+
requiresSha2+=(true)
686+
ja3+=("27718d56688425cd36a401c66147c4ee")
687+
ja4+=("t13d301100_1d37bd780c83_8e6e362c5eac")
688+
current+=(true)
689+
666690
names+=("Apple Mail (16.0)")
667691
short+=("apple_mail_16_0")
668692
ch_ciphers+=("ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-DES-CBC3-SHA:AES256-GCM-SHA384:AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:AES256-SHA:AES128-SHA:DES-CBC3-SHA")

‎t/baseline_data/default_testssl.csvfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,5 +138,6 @@
138138
"clientsimulation-openssl_110l","testssl.sh/81.169.166.184","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
139139
"clientsimulation-openssl_111d","testssl.sh/81.169.166.184","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
140140
"clientsimulation-openssl_303","testssl.sh/81.169.166.184","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
141+
"clientsimulation-openssl_350","testssl.sh/81.169.166.184","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""
141142
"clientsimulation-apple_mail_16_0","testssl.sh/81.169.166.184","443","INFO","TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384","",""
142143
"clientsimulation-thunderbird_91_9","testssl.sh/81.169.166.184","443","INFO","TLSv1.3 TLS_AES_256_GCM_SHA384","",""

0 commit comments

Comments
 (0)