diff options
author | Theo Buehler <tb@cvs.openbsd.org> | 2024-05-10 05:08:06 +0000 |
---|---|---|
committer | Theo Buehler <tb@cvs.openbsd.org> | 2024-05-10 05:08:06 +0000 |
commit | f8bc27858dd03063b4f38da11456175686fc6977 (patch) | |
tree | 7d508d634c5e21d8e086bf4201b75c3daff48cee /lib/libssl/ssl_local.h | |
parent | a7d3d629cf0767ffe9bec2954b03495ebcfa422f (diff) |
Remove fixed nonce length information from algorithm2
This information has been part of tls12_key_block_generate() for a while
now. It remained in this table because at that point SSL_CIPHER was still
public. Nothing can access algorithm2 anymore from the outside, so this is
dead weight.
ok jsing
Diffstat (limited to 'lib/libssl/ssl_local.h')
-rw-r--r-- | lib/libssl/ssl_local.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/lib/libssl/ssl_local.h b/lib/libssl/ssl_local.h index 2266d5e3ce8..551bdd5766c 100644 --- a/lib/libssl/ssl_local.h +++ b/lib/libssl/ssl_local.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_local.h,v 1.14 2024/03/26 03:44:11 beck Exp $ */ +/* $OpenBSD: ssl_local.h,v 1.15 2024/05/10 05:08:05 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -263,20 +263,6 @@ __BEGIN_HIDDEN_DECLS #define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1) /* - * SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD is an algorithm2 flag that - * indicates that the variable part of the nonce is included as a prefix of - * the record (AES-GCM, for example, does this with an 8-byte variable nonce.) - */ -#define SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD (1 << 22) - -/* - * SSL_CIPHER_AEAD_FIXED_NONCE_LEN returns the number of bytes of fixed nonce - * for an SSL_CIPHER with an algorithm_mac of SSL_AEAD. - */ -#define SSL_CIPHER_AEAD_FIXED_NONCE_LEN(ssl_cipher) \ - (((ssl_cipher->algorithm2 >> 24) & 0xf) * 2) - -/* * Cipher strength information. */ #define SSL_STRONG_MASK 0x000001fcL |