GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — crypto: make auth tag size assumption explicit · nodejs/node@92aae40

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

deps/ncrypto
- ncrypto.h
src/crypto
- crypto_cipher.cc
- crypto_cipher.h

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎deps/ncrypto/ncrypto.h‎`

Copy file name to clipboardExpand all lines: deps/ncrypto/ncrypto.h

+8Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -285,6 +285,14 @@ class Cipher final {`
`285`	`285`	`public:`
`286`	`286`	`static constexpr size_t MAX_KEY_LENGTH = EVP_MAX_KEY_LENGTH;`
`287`	`287`	`static constexpr size_t MAX_IV_LENGTH = EVP_MAX_IV_LENGTH;`
	`288`	`+#ifdef EVP_MAX_AEAD_TAG_LENGTH`
	`289`	`+ static constexpr size_t MAX_AUTH_TAG_LENGTH = EVP_MAX_AEAD_TAG_LENGTH;`
	`290`	`+#else`
	`291`	`+ static constexpr size_t MAX_AUTH_TAG_LENGTH = 16;`
	`292`	`+#endif`
	`293`	`+ static_assert(EVP_GCM_TLS_TAG_LEN <= MAX_AUTH_TAG_LENGTH &&`
	`294`	`+ EVP_CCM_TLS_TAG_LEN <= MAX_AUTH_TAG_LENGTH &&`
	`295`	`+ EVP_CHACHAPOLY_TLS_TAG_LEN <= MAX_AUTH_TAG_LENGTH);`
`288`	`296`
`289`	`297`	`Cipher() = default;`
`290`	`298`	`Cipher(const EVP_CIPHER* cipher) : cipher_(cipher) {}`

Collapse file

`‎src/crypto/crypto_cipher.cc‎`

Copy file name to clipboardExpand all lines: src/crypto/crypto_cipher.cc

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ bool CipherBase::InitAuthenticated(std::string_view cipher_type,`
`459`	`459`	`// authentication tag length also defaults to 16 bytes when decrypting,`
`460`	`460`	`// whereas GCM would accept any valid authentication tag length.`
`461`	`461`	`if (ctx_.isChaCha20Poly1305()) {`
`462`		`- auth_tag_len = 16;`
	`462`	`+ auth_tag_len = EVP_CHACHAPOLY_TLS_TAG_LEN;`
`463`	`463`	`} else {`
`464`	`464`	`THROW_ERR_CRYPTO_INVALID_AUTH_TAG(`
`465`	`465`	`env(), "authTagLength required for %s", cipher_type);`
`@@ -572,7 +572,7 @@ void CipherBase::SetAuthTag(const FunctionCallbackInfo<Value>& args) {`
`572`	`572`	`}`
`573`	`573`
`574`	`574`	`if (cipher->ctx_.isGcmMode() && cipher->auth_tag_len_ == kNoAuthTagLength &&`
`575`		`- tag_len != 16 && env->EmitProcessEnvWarning()) {`
	`575`	`+ tag_len != EVP_GCM_TLS_TAG_LEN && env->EmitProcessEnvWarning()) {`
`576`	`576`	`if (ProcessEmitDeprecationWarning(`
`577`	`577`	`env,`
`578`	`578`	`"Using AES-GCM authentication tags of less than 128 bits without "`
`@@ -821,7 +821,7 @@ bool CipherBase::Final(std::unique_ptr<BackingStore>* out) {`
`821`	`821`	`// always be given by the user.`
`822`	`822`	`if (auth_tag_len_ == kNoAuthTagLength) {`
`823`	`823`	`CHECK(ctx_.isGcmMode());`
`824`		`- auth_tag_len_ = sizeof(auth_tag_);`
	`824`	`+ auth_tag_len_ = EVP_GCM_TLS_TAG_LEN;`
`825`	`825`	`}`
`826`	`826`	`ok = ctx_.getAeadTag(auth_tag_len_,`
`827`	`827`	`reinterpret_cast<unsigned char*>(auth_tag_));`

Collapse file

`‎src/crypto/crypto_cipher.h‎`

Copy file name to clipboardExpand all lines: src/crypto/crypto_cipher.h

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ class CipherBase : public BaseObject {`
`86`	`86`	`const CipherKind kind_;`
`87`	`87`	`AuthTagState auth_tag_state_;`
`88`	`88`	`unsigned int auth_tag_len_;`
`89`		`- char auth_tag_[EVP_GCM_TLS_TAG_LEN];`
	`89`	`+ char auth_tag_[ncrypto::Cipher::MAX_AUTH_TAG_LENGTH];`
`90`	`90`	`bool pending_auth_failed_;`
`91`	`91`	`int max_message_size_;`
`92`	`92`	`};`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.