Baguette/sodium.cr
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Chalsa NONCE_SIZE

Browse Source
This commit is contained in:
Didactic Drunk 2022-05-08 13:21:32 -07:00
parent 5e03d23ed9
commit 24c5a4170d
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
examples/constants.cr
View File

@ -17,6 +17,14 @@ puts ""
{% end %} {% end %}
puts "" puts ""
{% for sk in [Sodium::CryptoBox::SecretKey, Sodium::Sign::SecretKey] %}
sk = {{sk.id}}.new
pk = sk.public_key
# puts "#{sk.class} bytesize #{sk.to_slice.bytesize}"
puts "#{pk.class} bytesize #{pk.to_slice.bytesize}"
{% end %}
puts ""
{% for name in %w(KEY_SIZE NONCE_SIZE MAC_SIZE) %} {% for name in %w(KEY_SIZE NONCE_SIZE MAC_SIZE) %}
puts "Sodium::SecretBox::{{ name.id }} #{Sodium::SecretBox::{{ name.id }}}" puts "Sodium::SecretBox::{{ name.id }} #{Sodium::SecretBox::{{ name.id }}}"
{% end %} {% end %}
@ -47,9 +55,8 @@ puts ""
{% end %} {% end %}
puts "" puts ""
{% for sk in [Sodium::CryptoBox::SecretKey, Sodium::Sign::SecretKey] %} {% for name in %w(XChaCha20 ChaCha20Ietf ChaCha20 XSalsa20 Salsa20) %}
sk = {{sk.id}}.new c = Sodium::Cipher::{{name.id}}.random
pk = sk.public_key # puts "#{c.class} key_size #{c.key_size}"
puts "#{sk.class} bytesize #{sk.to_slice.bytesize}" puts "#{c.class} nonce_size #{c.nonce_size}"
puts "#{pk.class} bytesize #{pk.to_slice.bytesize}"
{% end %} {% end %}

10
src/sodium/cipher/chalsa.cr
View File

@ -14,7 +14,7 @@ module Sodium::Cipher
def initialize(key : Crypto::Secret | Bytes, nonce = nil) def initialize(key : Crypto::Secret | Bytes, nonce = nil)
raise ArgumentError.new("key must be #{key_size} bytes, got #{key.bytesize}") if key.bytesize != key_size raise ArgumentError.new("key must be #{key_size} bytes, got #{key.bytesize}") if key.bytesize != key_size
@key = key.is_a?(Crypto::Secret) ? key : Sodium::SecureBuffer.new(key) @key = key.is_a?(Crypto::Secret) ? key : Sodium::SecureBuffer.copy_from(key)
self.nonce = nonce if nonce self.nonce = nonce if nonce
end end
@ -87,9 +87,7 @@ module Sodium::Cipher
end end
end end
{% for key, valtup in {"XSalsa20" => {"xsalsa20", false}, "Salsa20" => {"salsa20", false}, "XChaCha20" => {"xchacha20", false}, "ChaCha20Ietf" => {"chacha20_ietf", true}, "ChaCha20" => {"chacha20", false}} %} {% for key, val in {"XSalsa20" => "xsalsa20", "Salsa20" => "salsa20", "XChaCha20" => "xchacha20", "ChaCha20Ietf" => "chacha20_ietf", "ChaCha20" => "chacha20"} %}
{% val = valtup[0] %}
{% ietf = valtup[1] %}
# These classes can be used to generate pseudo-random data from a key, # These classes can be used to generate pseudo-random data from a key,
# or as building blocks for implementing custom constructions, but they # or as building blocks for implementing custom constructions, but they
# are not alternatives to secretbox. # are not alternatives to secretbox.
@ -102,8 +100,8 @@ module Sodium::Cipher
# #
# WARNING: Not validated against test vectors. You should probably write some before using this class. # WARNING: Not validated against test vectors. You should probably write some before using this class.
class {{ key.id }} < Chalsa class {{ key.id }} < Chalsa
KEY_SIZE = LibSodium.crypto_stream_chacha20_{{ ietf ? "ietf_".id : "".id }}keybytes.to_i32 KEY_SIZE = LibSodium.crypto_stream_{{ val.id }}_keybytes.to_i32
NONCE_SIZE = LibSodium.crypto_stream_chacha20_{{ ietf ? "ietf_".id : "".id }}noncebytes.to_i32 NONCE_SIZE = LibSodium.crypto_stream_{{ val.id }}_noncebytes.to_i32
def self.random def self.random
new key: Sodium::SecureBuffer.random(KEY_SIZE), nonce: Random::Secure.random_bytes(NONCE_SIZE) new key: Sodium::SecureBuffer.random(KEY_SIZE), nonce: Random::Secure.random_bytes(NONCE_SIZE)