Modify sigalgs extension processing for TLS 1.3.

- Make a separate sigalgs list for TLS 1.3 including only modern
  algorithm choices which we use when the handshake will not negotiate
  TLS 1.2
- Modify the legacy sigalgs for TLS 1.2 to include the RSA PSS algorithms as
  mandated by RFC8446 when the handshake will permit negotiation of TLS 1.2
ok jsing@ tb@

2 files changed, 28 insertions, 25 deletions

diff --git a/src/regress/lib/libssl/client/clienttest.c b/src/regress/lib/libssl/client/clienttest.c
index cb45dc583c..25a8790e61 100644
--- a/src/regress/lib/libssl/client/clienttest.c
+++ b/src/regress/lib/libssl/client/clienttest.c
@@ -141,15 +141,15 @@ static unsigned char cipher_list_tls12_chacha[] = {
 };
 
 static unsigned char client_hello_tls12[] = {
-        0x16, 0x03, 0x01, 0x00, 0xbf, 0x01, 0x00, 0x00,
-        0xbb, 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, 0x00, 0x00, 0x5c, 0xcc, 0xa9,
-        0xcc, 0xa8, 0xcc, 0xaa, 0xc0, 0x30, 0xc0, 0x2c,
-        0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14, 0xc0, 0x0a,
-        0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39, 0xff, 0x85,
+        0x16, 0x03, 0x01, 0x00, 0xc5, 0x01, 0x00, 0x00,
+        0xc1, 0x03, 0x03, 0xc9, 0xf9, 0x1f, 0x05, 0xaf,
+        0x61, 0xd7, 0xe7, 0x84, 0xd1, 0x1c, 0x6f, 0x79,
+        0x32, 0x04, 0x8e, 0x5c, 0xe3, 0x18, 0x5a, 0x85,
+        0xee, 0x44, 0xe1, 0xca, 0x32, 0xce, 0x07, 0xd3,
+        0xdb, 0x0f, 0x91, 0x00, 0x00, 0x5c, 0xc0, 0x30,
+        0xc0, 0x2c, 0xc0, 0x28, 0xc0, 0x24, 0xc0, 0x14,
+        0xc0, 0x0a, 0x00, 0x9f, 0x00, 0x6b, 0x00, 0x39,
+        0xcc, 0xa9, 0xcc, 0xa8, 0xcc, 0xaa, 0xff, 0x85,
         0x00, 0xc4, 0x00, 0x88, 0x00, 0x81, 0x00, 0x9d,
         0x00, 0x3d, 0x00, 0x35, 0x00, 0xc0, 0x00, 0x84,
         0xc0, 0x2f, 0xc0, 0x2b, 0xc0, 0x27, 0xc0, 0x23,
@@ -158,14 +158,15 @@ static unsigned char client_hello_tls12[] = {
         0x00, 0x3c, 0x00, 0x2f, 0x00, 0xba, 0x00, 0x41,
         0xc0, 0x11, 0xc0, 0x07, 0x00, 0x05, 0x00, 0x04,
         0xc0, 0x12, 0xc0, 0x08, 0x00, 0x16, 0x00, 0x0a,
-        0x00, 0xff, 0x01, 0x00, 0x00, 0x36, 0x00, 0x0b,
+        0x00, 0xff, 0x01, 0x00, 0x00, 0x3c, 0x00, 0x0b,
         0x00, 0x02, 0x01, 0x00, 0x00, 0x0a, 0x00, 0x08,
         0x00, 0x06, 0x00, 0x1d, 0x00, 0x17, 0x00, 0x18,
-        0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x1c,
-        0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef,
-        0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03,
-        0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03,
-        0x02, 0x01, 0x02, 0x03,
+        0x00, 0x23, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x22,
+        0x00, 0x20, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03,
+        0xef, 0xef, 0x08, 0x05, 0x05, 0x01, 0x05, 0x03,
+        0x08, 0x04, 0x04, 0x01, 0x04, 0x03, 0xee, 0xee,
+        0xed, 0xed, 0x03, 0x01, 0x03, 0x03, 0x02, 0x01,
+        0x02, 0x03,
 };
 
 struct client_hello_test {
diff --git a/src/regress/lib/libssl/tlsext/tlsexttest.c b/src/regress/lib/libssl/tlsext/tlsexttest.c
index 7a9f7d9be7..3387b86f3f 100644
--- a/src/regress/lib/libssl/tlsext/tlsexttest.c
+++ b/src/regress/lib/libssl/tlsext/tlsexttest.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tlsexttest.c,v 1.22 2019/01/18 12:09:52 beck Exp $ */
+/* $OpenBSD: tlsexttest.c,v 1.23 2019/01/23 16:46:04 beck Exp $ */
 /*
  * Copyright (c) 2017 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -1505,10 +1505,11 @@ test_tlsext_ri_server(void)
  */
 
 static unsigned char tlsext_sigalgs_client[] = {
-        0x00, 0x1a, 0x06, 0x01, 0x06, 0x03, 0xef, 0xef,
-        0x05, 0x01, 0x05, 0x03, 0x04, 0x01, 0x04, 0x03,
-        0xee, 0xee, 0xed, 0xed, 0x03, 0x01, 0x03, 0x03,
-        0x02, 0x01, 0x02, 0x03,
+        0x00, 0x20, 0x08, 0x06, 0x06, 0x01, 0x06, 0x03,
+        0xef, 0xef, 0x08, 0x05, 0x05, 0x01, 0x05, 0x03,
+        0x08, 0x04, 0x04, 0x01, 0x04, 0x03, 0xee, 0xee,
+        0xed, 0xed, 0x03, 0x01, 0x03, 0x03, 0x02, 0x01,
+        0x02, 0x03,
 };
 
 static int
@@ -2732,13 +2733,14 @@ test_tlsext_srtp_server(void)
 #endif /* OPENSSL_NO_SRTP */
 
 unsigned char tlsext_clienthello_default[] = {
-        0x00, 0x36, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00,
+        0x00, 0x3c, 0x00, 0x0b, 0x00, 0x02, 0x01, 0x00,
         0x00, 0x0a, 0x00, 0x08, 0x00, 0x06, 0x00, 0x1d,
         0x00, 0x17, 0x00, 0x18, 0x00, 0x23, 0x00, 0x00,
-        0x00, 0x0d, 0x00, 0x1c, 0x00, 0x1a, 0x06, 0x01,
-        0x06, 0x03, 0xef, 0xef, 0x05, 0x01, 0x05, 0x03,
-        0x04, 0x01, 0x04, 0x03, 0xee, 0xee, 0xed, 0xed,
-        0x03, 0x01, 0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
+        0x00, 0x0d, 0x00, 0x22, 0x00, 0x20, 0x08, 0x06,
+        0x06, 0x01, 0x06, 0x03, 0xef, 0xef, 0x08, 0x05,
+        0x05, 0x01, 0x05, 0x03, 0x08, 0x04, 0x04, 0x01,
+        0x04, 0x03, 0xee, 0xee, 0xed, 0xed, 0x03, 0x01,
+        0x03, 0x03, 0x02, 0x01, 0x02, 0x03,
 };
 
 unsigned char tlsext_clienthello_disabled[] = {};