From 0e6c55ddd378694496e9b69ae4c5d80e31f951ec Mon Sep 17 00:00:00 2001 From: Alexander Klink Date: Sun, 19 Sep 2010 14:09:41 +0200 Subject: [PATCH] formatting fix --- lib/secretsharing/shamir.rb | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/secretsharing/shamir.rb b/lib/secretsharing/shamir.rb index c81b4e6..80044af 100644 --- a/lib/secretsharing/shamir.rb +++ b/lib/secretsharing/shamir.rb @@ -144,7 +144,7 @@ module SecretSharing class SecretSharing::Shamir::Share attr_reader :x, :y, :prime_bitlength, :prime - FORMAT_VERSION = '0' + FORMAT_VERSION = '0' def initialize(x, y, prime, prime_bitlength) @x = x @@ -154,30 +154,30 @@ module SecretSharing end def self.from_string(string) - version = string[0,1] - if version != '0' then - raise "invalid share format version #{version}." - end - x = string[1,2].hex - prime_bitlength = 4 * string[-2,2].hex + 1 - p_x_str = string[3, string.length - 9] - checksum = string[-6, 4] - computed_checksum = Digest::SHA1.hexdigest(p_x_str)[0,4].upcase - if checksum != computed_checksum then - raise "invalid checksum. expected #{checksum}, got #{computed_checksum}" - end - prime = SecretSharing::Shamir.smallest_prime_of_bitlength(prime_bitlength) - self.new(x, OpenSSL::BN.new(p_x_str, 16), prime, prime_bitlength) + version = string[0,1] + if version != '0' then + raise "invalid share format version #{version}." + end + x = string[1,2].hex + prime_bitlength = 4 * string[-2,2].hex + 1 + p_x_str = string[3, string.length - 9] + checksum = string[-6, 4] + computed_checksum = Digest::SHA1.hexdigest(p_x_str)[0,4].upcase + if checksum != computed_checksum then + raise "invalid checksum. expected #{checksum}, got #{computed_checksum}" + end + prime = SecretSharing::Shamir.smallest_prime_of_bitlength(prime_bitlength) + self.new(x, OpenSSL::BN.new(p_x_str, 16), prime, prime_bitlength) end def to_s - # bitlength in nibbles to save space - prime_nibbles = (@prime_bitlength - 1) / 4 - p_x = ("%x" % @y).upcase - FORMAT_VERSION + ("%02x" % @x).upcase \ - + p_x \ - + Digest::SHA1.hexdigest(p_x)[0,4].upcase \ - + ("%02x" % prime_nibbles).upcase + # bitlength in nibbles to save space + prime_nibbles = (@prime_bitlength - 1) / 4 + p_x = ("%x" % @y).upcase + FORMAT_VERSION + ("%02x" % @x).upcase \ + + p_x \ + + Digest::SHA1.hexdigest(p_x)[0,4].upcase \ + + ("%02x" % prime_nibbles).upcase end end end -- 2.11.4.GIT