patches are not needed since go tag weekly.2012-01-15

[epoint] / patches / sig.diff

diff --git a/patches/sig.diff b/patches/sig.diff
deleted file mode 100644 (file)
index 1626d11..0000000
--- a/patches/sig.diff
+++ /dev/null
@@ -1,111 +0,0 @@
-diff -r 7ec969250bfc src/pkg/crypto/openpgp/packet/signature.go
---- a/src/pkg/crypto/openpgp/packet/signature.go       Tue Dec 27 09:49:19 2011 -0500
-+++ b/src/pkg/crypto/openpgp/packet/signature.go       Sat Dec 31 02:32:41 2011 +0100
-@@ -164,7 +164,7 @@
- const (
-       creationTimeSubpacket        signatureSubpacketType = 2
-       signatureExpirationSubpacket signatureSubpacketType = 3
--      keyExpirySubpacket           signatureSubpacketType = 9
-+      keyExpirationSubpacket       signatureSubpacketType = 9
-       prefSymmetricAlgosSubpacket  signatureSubpacketType = 11
-       issuerSubpacket              signatureSubpacketType = 16
-       prefHashAlgosSubpacket       signatureSubpacketType = 21
-@@ -225,11 +225,7 @@
-                       return
-               }
-               t := binary.BigEndian.Uint32(subpacket)
--              if t == 0 {
--                      sig.CreationTime = time.Time{}
--              } else {
--                      sig.CreationTime = time.Unix(int64(t), 0)
--              }
-+              sig.CreationTime = time.Unix(int64(t), 0)
-       case signatureExpirationSubpacket:
-               // Signature expiration time, section 5.2.3.10
-               if !isHashed {
-@@ -241,7 +237,7 @@
-               }
-               sig.SigLifetimeSecs = new(uint32)
-               *sig.SigLifetimeSecs = binary.BigEndian.Uint32(subpacket)
--      case keyExpirySubpacket:
-+      case keyExpirationSubpacket:
-               // Key expiration time, section 5.2.3.6
-               if !isHashed {
-                       return
-@@ -443,7 +439,15 @@
-               sig.RSASignature.bytes, err = rsa.SignPKCS1v15(rand.Reader, priv.PrivateKey.(*rsa.PrivateKey), sig.Hash, digest)
-               sig.RSASignature.bitLength = uint16(8 * len(sig.RSASignature.bytes))
-       case PubKeyAlgoDSA:
--              r, s, err := dsa.Sign(rand.Reader, priv.PrivateKey.(*dsa.PrivateKey), digest)
-+              dsaPrivateKey := priv.PrivateKey.(*dsa.PrivateKey)
-+              // Hash truncation according to FIPS 186-3 section 4.6
-+              // Assuming Q.BitLen() is a multiple of 8
-+              n := len(digest)
-+              k := dsaPrivateKey.Q.BitLen() / 8
-+              if n > k {
-+                      n = k
-+              }
-+              r, s, err := dsa.Sign(rand.Reader, dsaPrivateKey, digest[:n])
-               if err == nil {
-                       sig.DSASigR.bytes = r.Bytes()
-                       sig.DSASigR.bitLength = uint16(8 * len(sig.DSASigR.bytes))
-@@ -556,5 +560,59 @@
-               subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, false, keyId})
-       }
- 
-+      if sig.SigLifetimeSecs != nil && *sig.SigLifetimeSecs != 0 {
-+              sigLifetime := make([]byte, 4)
-+              binary.BigEndian.PutUint32(sigLifetime, *sig.SigLifetimeSecs)
-+              // signature expiration is marked as critical
-+              subpackets = append(subpackets, outputSubpacket{true, signatureExpirationSubpacket, true, sigLifetime})
-+      }
-+
-+      // The following subpackets may only appear in self-signatures
-+
-+      if sig.KeyLifetimeSecs != nil && *sig.KeyLifetimeSecs != 0 {
-+              keyLifetime := make([]byte, 4)
-+              binary.BigEndian.PutUint32(keyLifetime, *sig.KeyLifetimeSecs)
-+              // TODO:
-+              // key expiration is marked as critical
-+              subpackets = append(subpackets, outputSubpacket{true, keyExpirationSubpacket, true, keyLifetime})
-+      }
-+
-+      if sig.IsPrimaryId != nil && *sig.IsPrimaryId {
-+              subpackets = append(subpackets, outputSubpacket{true, primaryUserIdSubpacket, false, []byte{1}})
-+      }
-+
-+      // []byte slices of preferred algorithms are not copied
-+
-+      if len(sig.PreferredSymmetric) > 0 {
-+              subpackets = append(subpackets, outputSubpacket{true, prefSymmetricAlgosSubpacket, false, sig.PreferredSymmetric})
-+      }
-+
-+      if len(sig.PreferredHash) > 0 {
-+              subpackets = append(subpackets, outputSubpacket{true, prefHashAlgosSubpacket, false, sig.PreferredHash})
-+      }
-+
-+      if len(sig.PreferredCompression) > 0 {
-+              subpackets = append(subpackets, outputSubpacket{true, prefCompressionSubpacket, false, sig.PreferredCompression})
-+      }
-+
-+      // The Key Flags subpacket may only appear in self-signatures or certification signatures
-+
-+      if sig.FlagsValid {
-+              flags := byte(0)
-+              if sig.FlagCertify {
-+                      flags |= 1
-+              }
-+              if sig.FlagSign {
-+                      flags |= 2
-+              }
-+              if sig.FlagEncryptCommunications {
-+                      flags |= 4
-+              }
-+              if sig.FlagEncryptStorage {
-+                      flags |= 8
-+              }
-+              subpackets = append(subpackets, outputSubpacket{true, keyFlagsSubpacket, false, []byte{flags}})
-+      }
-+
-       return
- }