diff options
author | jsing <> | 2014-11-02 10:42:38 +0000 |
---|---|---|
committer | jsing <> | 2014-11-02 10:42:38 +0000 |
commit | 2ac1fcf6771c75502e194a147db7f1f45d5e41c7 (patch) | |
tree | 3ed7ee3cc200eca8338f3c0d3d316d9d9908400a /src/lib/libssl/ssl_locl.h | |
parent | e244ca2d4267e910064cdcaff60ffd2c0efd0c3f (diff) | |
download | openbsd-2ac1fcf6771c75502e194a147db7f1f45d5e41c7.tar.gz openbsd-2ac1fcf6771c75502e194a147db7f1f45d5e41c7.tar.bz2 openbsd-2ac1fcf6771c75502e194a147db7f1f45d5e41c7.zip |
Remove remnants from RC2 and SEED - there are no longer any cipher suites
that use these algorithms (and SEED was removed from libcrypto some time
ago).
ok doug@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index e7bcb890e4..9aa9bc60ff 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.73 2014/10/31 15:25:55 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.74 2014/11/02 10:42:38 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 | * |
@@ -274,18 +274,16 @@ | |||
274 | #define SSL_DES 0x00000001L | 274 | #define SSL_DES 0x00000001L |
275 | #define SSL_3DES 0x00000002L | 275 | #define SSL_3DES 0x00000002L |
276 | #define SSL_RC4 0x00000004L | 276 | #define SSL_RC4 0x00000004L |
277 | #define SSL_RC2 0x00000008L | 277 | #define SSL_IDEA 0x00000008L |
278 | #define SSL_IDEA 0x00000010L | 278 | #define SSL_eNULL 0x00000010L |
279 | #define SSL_eNULL 0x00000020L | 279 | #define SSL_AES128 0x00000020L |
280 | #define SSL_AES128 0x00000040L | 280 | #define SSL_AES256 0x00000040L |
281 | #define SSL_AES256 0x00000080L | 281 | #define SSL_CAMELLIA128 0x00000080L |
282 | #define SSL_CAMELLIA128 0x00000100L | 282 | #define SSL_CAMELLIA256 0x00000100L |
283 | #define SSL_CAMELLIA256 0x00000200L | 283 | #define SSL_eGOST2814789CNT 0x00000200L |
284 | #define SSL_eGOST2814789CNT 0x00000400L | 284 | #define SSL_AES128GCM 0x00000400L |
285 | #define SSL_SEED 0x00000800L | 285 | #define SSL_AES256GCM 0x00000800L |
286 | #define SSL_AES128GCM 0x00001000L | 286 | #define SSL_CHACHA20POLY1305 0x00001000L |
287 | #define SSL_AES256GCM 0x00002000L | ||
288 | #define SSL_CHACHA20POLY1305 0x00004000L | ||
289 | 287 | ||
290 | #define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) | 288 | #define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) |
291 | #define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) | 289 | #define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) |