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

Chalsa prefer .random over .new

Browse Source
This commit is contained in:
Didactic Drunk 2022-04-29 12:50:02 -07:00
parent f036295aa3
commit 508dd87b67
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/sodium/cipher/aead/chalsa.cr
View File

@ -3,11 +3,11 @@ require "../../secure_buffer"
require "../../nonce" require "../../nonce"
module Sodium::Cipher::Aead module Sodium::Cipher::Aead
abstract class Chalsa abstract struct Chalsa
# Encryption key # Encryption key
getter key : SecureBuffer getter key : SecureBuffer
# Initializes with a new random key. @[Deprecated("use .random instead of .new")]
def initialize def initialize
@key = SecureBuffer.random key_size @key = SecureBuffer.random key_size
end end
@ -25,8 +25,7 @@ module Sodium::Cipher::Aead
end end
# Encrypts `src` and returns {ciphertext, nonce} # Encrypts `src` and returns {ciphertext, nonce}
def encrypt(src, dst : Bytes? = nil, *, nonce = nil, additional = nil) def encrypt(src, dst : Bytes? = nil, *, nonce = nil, additional = nil) : {Bytes, Nonce}
{Bytes, Nonce}
offset = src.bytesize offset = src.bytesize
dst ||= Bytes.new(offset + mac_size) dst ||= Bytes.new(offset + mac_size)
mac = dst[offset, mac_size] mac = dst[offset, mac_size]
@ -95,11 +94,17 @@ module Sodium::Cipher::Aead
# See `spec/sodium/cipher/aead/chalsa_spec.cr` for examples on how to use this class. # See `spec/sodium/cipher/aead/chalsa_spec.cr` for examples on how to use this class.
# #
# 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 struct {{ key.id }} < Chalsa
KEY_SIZE = LibSodium.crypto_aead{{ val.id }}_keybytes.to_i32 KEY_SIZE = LibSodium.crypto_aead{{ val.id }}_keybytes.to_i32
MAC_SIZE = LibSodium.crypto_aead{{ val.id }}_abytes.to_i32 MAC_SIZE = LibSodium.crypto_aead{{ val.id }}_abytes.to_i32
NONCE_SIZE = LibSodium.crypto_aead{{ val.id }}_npubbytes.to_i32 NONCE_SIZE = LibSodium.crypto_aead{{ val.id }}_npubbytes.to_i32
# Initializes with a new random key.
def self.random
key = SecureBuffer.random KEY_SIZE
new key
end
# `src` and `dst` may be the same object but should not overlap. # `src` and `dst` may be the same object but should not overlap.
# May supply `mac`, otherwise a new one is returned. # May supply `mac`, otherwise a new one is returned.
# May supply `additional` # May supply `additional`
@ -108,7 +113,7 @@ module Sodium::Cipher::Aead
nonce ||= Sodium::Nonce.random nonce ||= Sodium::Nonce.random
mac ||= Bytes.new MAC_SIZE mac ||= Bytes.new MAC_SIZE
raise ArgumentError.new("src and dst bytesize must be identical") if src.bytesize != dst.bytesize raise ArgumentError.new("src and dst bytesize must be identical #{src.bytesize} != #{dst.bytesize}") if src.bytesize != dst.bytesize
raise ArgumentError.new("nonce size mismatch, got #{nonce.bytesize}, wanted #{NONCE_SIZE}") unless nonce.bytesize == NONCE_SIZE raise ArgumentError.new("nonce size mismatch, got #{nonce.bytesize}, wanted #{NONCE_SIZE}") unless nonce.bytesize == NONCE_SIZE
raise ArgumentError.new("mac size mismatch, got #{mac.bytesize}, wanted #{MAC_SIZE}") unless mac.bytesize == MAC_SIZE raise ArgumentError.new("mac size mismatch, got #{mac.bytesize}, wanted #{MAC_SIZE}") unless mac.bytesize == MAC_SIZE
@ -130,7 +135,7 @@ module Sodium::Cipher::Aead
# Must supply `additional` if supplied to #encrypt_detached # Must supply `additional` if supplied to #encrypt_detached
def decrypt_detached(src : Bytes, dst : Bytes? = nil, *, nonce : Sodium::Nonce, mac : Bytes, additional : String | Bytes | Nil = nil) : Bytes def decrypt_detached(src : Bytes, dst : Bytes? = nil, *, nonce : Sodium::Nonce, mac : Bytes, additional : String | Bytes | Nil = nil) : Bytes
dst ||= Bytes.new src.bytesize dst ||= Bytes.new src.bytesize
raise ArgumentError.new("src and dst bytesize must be identical") if src.bytesize != dst.bytesize raise ArgumentError.new("src and dst bytesize must be identical #{src.bytesize} != #{dst.bytesize}") if src.bytesize != dst.bytesize
raise ArgumentError.new("nonce size mismatch, got #{nonce.bytesize}, wanted #{NONCE_SIZE}") unless nonce.bytesize == NONCE_SIZE raise ArgumentError.new("nonce size mismatch, got #{nonce.bytesize}, wanted #{NONCE_SIZE}") unless nonce.bytesize == NONCE_SIZE
raise ArgumentError.new("mac size mismatch, got #{mac.bytesize}, wanted #{MAC_SIZE}") unless mac.bytesize == MAC_SIZE raise ArgumentError.new("mac size mismatch, got #{mac.bytesize}, wanted #{MAC_SIZE}") unless mac.bytesize == MAC_SIZE