diff options
| author | jsing <> | 2017-02-21 15:28:27 +0000 |
|---|---|---|
| committer | jsing <> | 2017-02-21 15:28:27 +0000 |
| commit | 1e186842df883d79e6659f67be239947d6712a5d (patch) | |
| tree | 6cf136c9fd33f9f817232c034769b204fea65a9d /src/lib/libssl/ssl_locl.h | |
| parent | 02ca28ec0eaa561d8ef6d5b474567ba08a6ee767 (diff) | |
| download | openbsd-1e186842df883d79e6659f67be239947d6712a5d.tar.gz openbsd-1e186842df883d79e6659f67be239947d6712a5d.tar.bz2 openbsd-1e186842df883d79e6659f67be239947d6712a5d.zip | |
Remove STREEBOG 512 as a TLS MAC since there are currently no cipher suites
that make use of it.
ok bcook@ inoguchi@
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_locl.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index a64edd2c18..62d9d0314e 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.173 2017/02/07 02:08:38 beck Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.174 2017/02/21 15:28:27 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 | * |
| @@ -250,7 +250,6 @@ __BEGIN_HIDDEN_DECLS | |||
| 250 | /* Not a real MAC, just an indication it is part of cipher */ | 250 | /* Not a real MAC, just an indication it is part of cipher */ |
| 251 | #define SSL_AEAD 0x00000040L | 251 | #define SSL_AEAD 0x00000040L |
| 252 | #define SSL_STREEBOG256 0x00000080L | 252 | #define SSL_STREEBOG256 0x00000080L |
| 253 | #define SSL_STREEBOG512 0x00000100L | ||
| 254 | 253 | ||
| 255 | /* Bits for algorithm_ssl (protocol version) */ | 254 | /* Bits for algorithm_ssl (protocol version) */ |
| 256 | #define SSL_SSLV3 0x00000002L | 255 | #define SSL_SSLV3 0x00000002L |
| @@ -266,12 +265,11 @@ __BEGIN_HIDDEN_DECLS | |||
| 266 | #define SSL_HANDSHAKE_MAC_SHA256 0x80 | 265 | #define SSL_HANDSHAKE_MAC_SHA256 0x80 |
| 267 | #define SSL_HANDSHAKE_MAC_SHA384 0x100 | 266 | #define SSL_HANDSHAKE_MAC_SHA384 0x100 |
| 268 | #define SSL_HANDSHAKE_MAC_STREEBOG256 0x200 | 267 | #define SSL_HANDSHAKE_MAC_STREEBOG256 0x200 |
| 269 | #define SSL_HANDSHAKE_MAC_STREEBOG512 0x400 | ||
| 270 | #define SSL_HANDSHAKE_MAC_DEFAULT (SSL_HANDSHAKE_MAC_MD5 | SSL_HANDSHAKE_MAC_SHA) | 268 | #define SSL_HANDSHAKE_MAC_DEFAULT (SSL_HANDSHAKE_MAC_MD5 | SSL_HANDSHAKE_MAC_SHA) |
| 271 | 269 | ||
| 272 | /* When adding new digest in the ssl_ciph.c and increment SSM_MD_NUM_IDX | 270 | /* When adding new digest in the ssl_ciph.c and increment SSM_MD_NUM_IDX |
| 273 | * make sure to update this constant too */ | 271 | * make sure to update this constant too */ |
| 274 | #define SSL_MAX_DIGEST 8 | 272 | #define SSL_MAX_DIGEST 7 |
| 275 | 273 | ||
| 276 | #define SSL3_CK_ID 0x03000000 | 274 | #define SSL3_CK_ID 0x03000000 |
| 277 | #define SSL3_CK_VALUE_MASK 0x0000ffff | 275 | #define SSL3_CK_VALUE_MASK 0x0000ffff |
