Merge pull request #169 from BANKEX/develop

shamatar · web-flow · commit bed90b34e79b · 2018-06-27T21:02:02.000+03:00
some extra safeguards
diff --git a/web3swift/Convenience/Classes/LibSecp256k1Extension.swift b/web3swift/Convenience/Classes/LibSecp256k1Extension.swift
@@ -270,7 +270,7 @@ extension SECP256K1 {
         if v >= 27 {
             v = v - 27
         }
-        if v > 4 {
+        if v > 3 {
             return nil
         }
         return UnmarshaledSignature(v: v, r: r, s: s)
@@ -285,7 +285,7 @@ extension SECP256K1 {
     }
     
     static func marshalSignature(v: Data, r: Data, s: Data) -> Data? {
-        guard r.count == 32, s.count == 32 else {return nil}
+        guard r.count == 32, s.count == 32, v.count == 1 else {return nil}
         var completeSignature = Data(r)
         completeSignature.append(s)
         completeSignature.append(v)

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ extension SECP256K1 {`
`270`	`270`	`if v >= 27 {`
`271`	`271`	`v = v - 27`
`272`	`272`	`}`
`273`		`- if v > 4 {`
	`273`	`+ if v > 3 {`
`274`	`274`	`return nil`
`275`	`275`	`}`
`276`	`276`	`return UnmarshaledSignature(v: v, r: r, s: s)`
`@@ -285,7 +285,7 @@ extension SECP256K1 {`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`static func marshalSignature(v: Data, r: Data, s: Data) -> Data? {`
`288`		`- guard r.count == 32, s.count == 32 else {return nil}`
	`288`	`+ guard r.count == 32, s.count == 32, v.count == 1 else {return nil}`
`289`	`289`	`var completeSignature = Data(r)`
`290`	`290`	`completeSignature.append(s)`
`291`	`291`	`completeSignature.append(v)`