components/golang/patches/0074-crypto-dsa-eliminate-invalid-PublicKey-early.patch
author Shawn Walker-Salas <shawn.walker@oracle.com>
Thu, 14 Apr 2016 12:48:37 -0700
changeset 5781 ecbdf40c0a37
permissions -rw-r--r--
23108116 problem in UTILITY/GOLANG 23108194 problem in UTILITY/GOLANG
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5781
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     1
From 2cfbb875208f4acecfb0b72de5aebe37e8d03a35 Mon Sep 17 00:00:00 2001
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     2
From: Robert Griesemer <[email protected]>
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     3
Date: Tue, 5 Apr 2016 09:44:00 -0700
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     4
Subject: [PATCH 74/79] crypto/dsa: eliminate invalid PublicKey early
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     5
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     6
For PublicKey.P == 0, Verify will fail. Don't even try.
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     7
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     8
Change-Id: I1009f2b3dead8d0041626c946633acb10086d8c8
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
     9
Reviewed-on: https://go-review.googlesource.com/21533
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    10
Reviewed-by: Brad Fitzpatrick <[email protected]>
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    11
Run-TryBot: Brad Fitzpatrick <[email protected]>
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    12
TryBot-Result: Gobot Gobot <[email protected]>
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    13
Reviewed-on: https://go-review.googlesource.com/21637
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    14
---
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    15
 src/crypto/dsa/dsa.go | 4 ++++
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    16
 1 file changed, 4 insertions(+)
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    17
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    18
diff --git a/src/crypto/dsa/dsa.go b/src/crypto/dsa/dsa.go
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    19
index b7565a6..0ecb24a 100644
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    20
--- a/src/crypto/dsa/dsa.go
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    21
+++ b/src/crypto/dsa/dsa.go
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    22
@@ -249,6 +249,10 @@ func Sign(rand io.Reader, priv *PrivateKey, hash []byte) (r, s *big.Int, err err
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    23
 func Verify(pub *PublicKey, hash []byte, r, s *big.Int) bool {
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    24
 	// FIPS 186-3, section 4.7
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    25
 
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    26
+	if pub.P.Sign() == 0 {
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    27
+		return false
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    28
+	}
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    29
+
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    30
 	if r.Sign() < 1 || r.Cmp(pub.Q) >= 0 {
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    31
 		return false
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    32
 	}
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    33
-- 
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    34
2.7.4
ecbdf40c0a37 23108116 problem in UTILITY/GOLANG
Shawn Walker-Salas <shawn.walker@oracle.com>
parents:
diff changeset
    35