summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <>2017-08-28 16:37:04 +0000
committerjsing <>2017-08-28 16:37:04 +0000
commit06777404d5d3c9d777364d633ff082f434d357d5 (patch)
tree7a497786c0d665cfdd18ae5f1a51814d2866dc5d /src/lib/libssl/ssl_locl.h
parent25258122ceacc0befc2dd3c6150cc89fd6c00a7a (diff)
downloadopenbsd-06777404d5d3c9d777364d633ff082f434d357d5.tar.gz
openbsd-06777404d5d3c9d777364d633ff082f434d357d5.tar.bz2
openbsd-06777404d5d3c9d777364d633ff082f434d357d5.zip
Remove the original (pre-IETF) chacha20-poly1305 cipher suites.
Support for the IETF standardised chacha20-poly1305 cipher suites was added 16 months ago, which means they exist in both of the currently supported OpenBSD releases. Also prompted by Andreas Bartelt <obsd at bartula dot de>. ok beck@ doug@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index e789a4ae27..17a4a0d4f6 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.192 2017/08/27 02:58:04 doug Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.193 2017/08/28 16:37:04 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 *
@@ -233,7 +233,6 @@ __BEGIN_HIDDEN_DECLS
233#define SSL_AES128GCM 0x00000400L 233#define SSL_AES128GCM 0x00000400L
234#define SSL_AES256GCM 0x00000800L 234#define SSL_AES256GCM 0x00000800L
235#define SSL_CHACHA20POLY1305 0x00001000L 235#define SSL_CHACHA20POLY1305 0x00001000L
236#define SSL_CHACHA20POLY1305_OLD 0x00002000L
237 236
238#define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM) 237#define SSL_AES (SSL_AES128|SSL_AES256|SSL_AES128GCM|SSL_AES256GCM)
239#define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256) 238#define SSL_CAMELLIA (SSL_CAMELLIA128|SSL_CAMELLIA256)