diff options
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index a4e831577d..d5680fc14a 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.213 2018/09/05 16:48:11 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.214 2018/09/06 16:40:45 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -282,8 +282,10 @@ __BEGIN_HIDDEN_DECLS | |||
282 | #define TLS1_PRF_STREEBOG256 (SSL_HANDSHAKE_MAC_STREEBOG256 << TLS1_PRF_DGST_SHIFT) | 282 | #define TLS1_PRF_STREEBOG256 (SSL_HANDSHAKE_MAC_STREEBOG256 << TLS1_PRF_DGST_SHIFT) |
283 | #define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1) | 283 | #define TLS1_PRF (TLS1_PRF_MD5 | TLS1_PRF_SHA1) |
284 | 284 | ||
285 | /* Stream MAC for GOST ciphersuites from cryptopro draft | 285 | /* |
286 | * (currently this also goes into algorithm2) */ | 286 | * Stream MAC for GOST ciphersuites from cryptopro draft |
287 | * (currently this also goes into algorithm2). | ||
288 | */ | ||
287 | #define TLS1_STREAM_MAC 0x04 | 289 | #define TLS1_STREAM_MAC 0x04 |
288 | 290 | ||
289 | /* | 291 | /* |
@@ -294,14 +296,8 @@ __BEGIN_HIDDEN_DECLS | |||
294 | #define SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD (1 << 22) | 296 | #define SSL_CIPHER_ALGORITHM2_VARIABLE_NONCE_IN_RECORD (1 << 22) |
295 | 297 | ||
296 | /* | 298 | /* |
297 | * SSL_CIPHER_ALGORITHM2_AEAD is an algorithm2 flag that indicates the cipher | ||
298 | * is implemented via an EVP_AEAD. | ||
299 | */ | ||
300 | #define SSL_CIPHER_ALGORITHM2_AEAD (1 << 23) | ||
301 | |||
302 | /* | ||
303 | * SSL_CIPHER_AEAD_FIXED_NONCE_LEN returns the number of bytes of fixed nonce | 299 | * SSL_CIPHER_AEAD_FIXED_NONCE_LEN returns the number of bytes of fixed nonce |
304 | * for an SSL_CIPHER with the SSL_CIPHER_ALGORITHM2_AEAD flag. | 300 | * for an SSL_CIPHER with an algorithm_mac of SSL_AEAD. |
305 | */ | 301 | */ |
306 | #define SSL_CIPHER_AEAD_FIXED_NONCE_LEN(ssl_cipher) \ | 302 | #define SSL_CIPHER_AEAD_FIXED_NONCE_LEN(ssl_cipher) \ |
307 | (((ssl_cipher->algorithm2 >> 24) & 0xf) * 2) | 303 | (((ssl_cipher->algorithm2 >> 24) & 0xf) * 2) |