From 7f0bce66165341b853b74dc6a34adb5c399e306a Mon Sep 17 00:00:00 2001 From: Rene Meusel Date: Wed, 22 Feb 2023 16:19:31 +0100 Subject: [PATCH] deprecate AEAD_Mode::set_associated_data_vec() --- src/cli/pk_crypt.cpp | 4 ++-- src/lib/modes/aead/aead.h | 1 + src/lib/tls/tls12/tls_record.cpp | 2 +- src/lib/tls/tls_session.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cli/pk_crypt.cpp b/src/cli/pk_crypt.cpp index e88cd9e6165..8f76ac9e041 100644 --- a/src/cli/pk_crypt.cpp +++ b/src/cli/pk_crypt.cpp @@ -81,7 +81,7 @@ class PK_Encrypt final : public Command const Botan::secure_vector nonce = rng().random_vec(aead->default_nonce_length()); aead->set_key(file_key); - aead->set_associated_data_vec(encrypted_key); + aead->set_associated_data(encrypted_key); aead->start(nonce); aead->finish(data); @@ -203,7 +203,7 @@ class PK_Decrypt final : public Command rng()); aead->set_key(file_key); - aead->set_associated_data_vec(encrypted_key); + aead->set_associated_data(encrypted_key); aead->start(nonce); try diff --git a/src/lib/modes/aead/aead.h b/src/lib/modes/aead/aead.h index b580e77234a..7bd303ff462 100644 --- a/src/lib/modes/aead/aead.h +++ b/src/lib/modes/aead/aead.h @@ -107,6 +107,7 @@ class BOTAN_PUBLIC_API(2,0) AEAD_Mode : public Cipher_Mode * @param ad the associated data */ template + BOTAN_DEPRECATED("Simply use set_associated_data") void set_associated_data_vec(const std::vector& ad) { set_associated_data(ad.data(), ad.size()); diff --git a/src/lib/tls/tls12/tls_record.cpp b/src/lib/tls/tls12/tls_record.cpp index 71ece28bd1c..a3ebc5e9611 100644 --- a/src/lib/tls/tls12/tls_record.cpp +++ b/src/lib/tls/tls12/tls_record.cpp @@ -307,7 +307,7 @@ void decrypt_record(secure_vector& output, const size_t ptext_size = aead.output_length(msg_length); - aead.set_associated_data_vec( + aead.set_associated_data( cs.format_ad(record_sequence, record_type, record_version, diff --git a/src/lib/tls/tls_session.cpp b/src/lib/tls/tls_session.cpp index 0ed04493058..e05767d4d93 100644 --- a/src/lib/tls/tls_session.cpp +++ b/src/lib/tls/tls_session.cpp @@ -374,7 +374,7 @@ Session::encrypt(const SymmetricKey& key, RandomNumberGenerator& rng) const BOTAN_ASSERT_NOMSG(aead->valid_nonce_length(TLS_SESSION_CRYPT_AEAD_NONCE_LEN)); BOTAN_ASSERT_NOMSG(aead->tag_size() == TLS_SESSION_CRYPT_AEAD_TAG_SIZE); aead->set_key(aead_key); - aead->set_associated_data_vec(buf); + aead->set_associated_data(buf); aead->start(aead_nonce); aead->finish(bits, 0);