From 36db7c531991e953f0334e0b1bef61b4dda4af9a Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 26 Jan 2017 11:59:13 -0500 Subject: [PATCH 1/4] Update curve25519.rb See #152 --- lib/rbnacl/group_elements/curve25519.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/rbnacl/group_elements/curve25519.rb b/lib/rbnacl/group_elements/curve25519.rb index 34d1749..e6e949f 100644 --- a/lib/rbnacl/group_elements/curve25519.rb +++ b/lib/rbnacl/group_elements/curve25519.rb @@ -61,7 +61,9 @@ def mult(integer) Util.check_length(integer, SCALARBYTES, "integer") result = Util.zeros(SCALARBYTES) - self.class.scalarmult_curve25519(result, integer, @point) + ret = self.class.scalarmult_curve25519(result, integer, @point) + if ret != 0 + raise "Invalid curve25519 result" self.class.new(result) end From dd101f1b383194b873f3b71006ef2e625d60d638 Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 26 Jan 2017 15:05:40 -0500 Subject: [PATCH 2/4] Update curve25519.rb --- lib/rbnacl/group_elements/curve25519.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/rbnacl/group_elements/curve25519.rb b/lib/rbnacl/group_elements/curve25519.rb index e6e949f..af0f895 100644 --- a/lib/rbnacl/group_elements/curve25519.rb +++ b/lib/rbnacl/group_elements/curve25519.rb @@ -64,6 +64,7 @@ def mult(integer) ret = self.class.scalarmult_curve25519(result, integer, @point) if ret != 0 raise "Invalid curve25519 result" + end self.class.new(result) end From cc16e4f8adda11c732cea13ce9b53b161776556e Mon Sep 17 00:00:00 2001 From: Scott Date: Thu, 26 Jan 2017 17:57:34 -0500 Subject: [PATCH 3/4] Update curve25519.rb --- lib/rbnacl/group_elements/curve25519.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/rbnacl/group_elements/curve25519.rb b/lib/rbnacl/group_elements/curve25519.rb index af0f895..57858f0 100644 --- a/lib/rbnacl/group_elements/curve25519.rb +++ b/lib/rbnacl/group_elements/curve25519.rb @@ -61,9 +61,8 @@ def mult(integer) Util.check_length(integer, SCALARBYTES, "integer") result = Util.zeros(SCALARBYTES) - ret = self.class.scalarmult_curve25519(result, integer, @point) - if ret != 0 - raise "Invalid curve25519 result" + if self.class.scalarmult_curve25519(result, integer, @point) != 0 + raise CryptoError "Invalid curve25519 result" end self.class.new(result) From 7f82bc4666f53b7dcc2e4e2829facf6b362f8726 Mon Sep 17 00:00:00 2001 From: Scott Date: Fri, 3 Mar 2017 09:02:26 -0500 Subject: [PATCH 4/4] Update curve25519.rb --- lib/rbnacl/group_elements/curve25519.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/rbnacl/group_elements/curve25519.rb b/lib/rbnacl/group_elements/curve25519.rb index 57858f0..ed21305 100644 --- a/lib/rbnacl/group_elements/curve25519.rb +++ b/lib/rbnacl/group_elements/curve25519.rb @@ -61,11 +61,11 @@ def mult(integer) Util.check_length(integer, SCALARBYTES, "integer") result = Util.zeros(SCALARBYTES) - if self.class.scalarmult_curve25519(result, integer, @point) != 0 - raise CryptoError "Invalid curve25519 result" + if self.class.scalarmult_curve25519(result, integer, @point) + self.class.new(result) + else + raise CryptoError, "Invalid curve25519 result" end - - self.class.new(result) end # Return the point serialized as bytes