X-Git-Url: https://www.bearssl.org/gitweb//home/git/?p=BearSSL;a=blobdiff_plain;f=src%2Fssl%2Fssl_hs_common.t0;h=aa67ee8f818264c103c0a11ff58dceed165cccb3;hp=28a40326590e6a81568db5a92e6edf3ef5d79837;hb=042986b989521f0ae1e2fe3819c72f2fabcb70a6;hpb=05ac106834fa8889cf55ee462fe4108d4712040a

diff --git a/src/ssl/ssl_hs_common.t0 b/src/ssl/ssl_hs_common.t0
index 28a4032..aa67ee8 100644
--- a/src/ssl/ssl_hs_common.t0
+++ b/src/ssl/ssl_hs_common.t0
@@ -469,7 +469,7 @@ cc: read-chunk-native ( addr len -- addr len ) {
 			\ no_renegotiation has value 100, and we treat it
 			\ as a fatal alert.
 			dup 100 = if 256 + fail then
-			0= ret
+			0=
 		endof
 		\ Fatal alert implies context termination.
 		drop 256 + fail
@@ -1062,13 +1062,22 @@ cc: compute-Finished-inner ( from_client prf_id -- ) {
 	read16 open-elt
 	begin dup while
 		read8 { hash } read8 { sign }
-		\ We keep the value if the signature is either 1 (RSA)
-		\ or 3 (ECDSA), and the hash is one of the SHA-* functions
-		\ (2 to 6, from SHA-1 to SHA-512); we reject MD5.
-		hash 2 >= hash 6 <= and
-		sign 1 = sign 3 = or
-		and if
-			hashes 1 sign 1- 2 << hash + << or >hashes
+
+		\ If hash is 0x08 then this is a "new algorithm" identifier,
+		\ and we set the corresponding bit if it is in the 0..15
+		\ range. Otherwise, we keep the value only if the signature
+		\ is either 1 (RSA) or 3 (ECDSA), and the hash is one of the
+		\ SHA-* functions (2 to 6). Note that we reject MD5.
+		hash 8 = if
+			sign 15 <= if
+				1 sign 16 + << hashes or >hashes
+			then
+		else
+			hash 2 >= hash 6 <= and
+			sign 1 = sign 3 = or
+			and if
+				hashes 1 sign 1- 2 << hash + << or >hashes
+			then
 		then
 	repeat
 	close-elt