summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-11-02 10:42:38 +0000
committerjsing <>2014-11-02 10:42:38 +0000
commit2ac1fcf6771c75502e194a147db7f1f45d5e41c7 (patch)
tree3ed7ee3cc200eca8338f3c0d3d316d9d9908400a /src
parente244ca2d4267e910064cdcaff60ffd2c0efd0c3f (diff)
downloadopenbsd-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')
-rw-r--r--src/lib/libssl/src/ssl/ssl_ciph.c52
-rw-r--r--src/lib/libssl/src/ssl/ssl_locl.h24
-rw-r--r--src/lib/libssl/ssl_ciph.c52
-rw-r--r--src/lib/libssl/ssl_locl.h24
4 files changed, 46 insertions, 106 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 4bd085310f..1645f6af49 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.70 2014/10/15 13:57:21 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.71 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 *
@@ -150,22 +150,20 @@
150#define SSL_ENC_DES_IDX 0 150#define SSL_ENC_DES_IDX 0
151#define SSL_ENC_3DES_IDX 1 151#define SSL_ENC_3DES_IDX 1
152#define SSL_ENC_RC4_IDX 2 152#define SSL_ENC_RC4_IDX 2
153#define SSL_ENC_RC2_IDX 3 153#define SSL_ENC_IDEA_IDX 3
154#define SSL_ENC_IDEA_IDX 4 154#define SSL_ENC_NULL_IDX 4
155#define SSL_ENC_NULL_IDX 5 155#define SSL_ENC_AES128_IDX 5
156#define SSL_ENC_AES128_IDX 6 156#define SSL_ENC_AES256_IDX 6
157#define SSL_ENC_AES256_IDX 7 157#define SSL_ENC_CAMELLIA128_IDX 7
158#define SSL_ENC_CAMELLIA128_IDX 8 158#define SSL_ENC_CAMELLIA256_IDX 8
159#define SSL_ENC_CAMELLIA256_IDX 9 159#define SSL_ENC_GOST89_IDX 9
160#define SSL_ENC_GOST89_IDX 10 160#define SSL_ENC_AES128GCM_IDX 10
161#define SSL_ENC_SEED_IDX 11 161#define SSL_ENC_AES256GCM_IDX 11
162#define SSL_ENC_AES128GCM_IDX 12 162#define SSL_ENC_NUM_IDX 12
163#define SSL_ENC_AES256GCM_IDX 13
164#define SSL_ENC_NUM_IDX 14
165 163
166 164
167static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { 165static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
168 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL 166 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
169}; 167};
170 168
171#define SSL_MD_MD5_IDX 0 169#define SSL_MD_MD5_IDX 0
@@ -380,18 +378,10 @@ static const SSL_CIPHER cipher_aliases[] = {
380 .algorithm_enc = SSL_RC4, 378 .algorithm_enc = SSL_RC4,
381 }, 379 },
382 { 380 {
383 .name = SSL_TXT_RC2,
384 .algorithm_enc = SSL_RC2,
385 },
386 {
387 .name = SSL_TXT_IDEA, 381 .name = SSL_TXT_IDEA,
388 .algorithm_enc = SSL_IDEA, 382 .algorithm_enc = SSL_IDEA,
389 }, 383 },
390 { 384 {
391 .name = SSL_TXT_SEED,
392 .algorithm_enc = SSL_SEED,
393 },
394 {
395 .name = SSL_TXT_eNULL, 385 .name = SSL_TXT_eNULL,
396 .algorithm_enc = SSL_eNULL, 386 .algorithm_enc = SSL_eNULL,
397 }, 387 },
@@ -536,8 +526,6 @@ ssl_load_ciphers(void)
536 EVP_get_cipherbyname(SN_des_ede3_cbc); 526 EVP_get_cipherbyname(SN_des_ede3_cbc);
537 ssl_cipher_methods[SSL_ENC_RC4_IDX]= 527 ssl_cipher_methods[SSL_ENC_RC4_IDX]=
538 EVP_get_cipherbyname(SN_rc4); 528 EVP_get_cipherbyname(SN_rc4);
539 ssl_cipher_methods[SSL_ENC_RC2_IDX]=
540 EVP_get_cipherbyname(SN_rc2_cbc);
541#ifndef OPENSSL_NO_IDEA 529#ifndef OPENSSL_NO_IDEA
542 ssl_cipher_methods[SSL_ENC_IDEA_IDX]= 530 ssl_cipher_methods[SSL_ENC_IDEA_IDX]=
543 EVP_get_cipherbyname(SN_idea_cbc); 531 EVP_get_cipherbyname(SN_idea_cbc);
@@ -554,8 +542,6 @@ ssl_load_ciphers(void)
554 EVP_get_cipherbyname(SN_camellia_256_cbc); 542 EVP_get_cipherbyname(SN_camellia_256_cbc);
555 ssl_cipher_methods[SSL_ENC_GOST89_IDX]= 543 ssl_cipher_methods[SSL_ENC_GOST89_IDX]=
556 EVP_get_cipherbyname(SN_gost89_cnt); 544 EVP_get_cipherbyname(SN_gost89_cnt);
557 ssl_cipher_methods[SSL_ENC_SEED_IDX]=
558 EVP_get_cipherbyname(SN_seed_cbc);
559 545
560 ssl_cipher_methods[SSL_ENC_AES128GCM_IDX]= 546 ssl_cipher_methods[SSL_ENC_AES128GCM_IDX]=
561 EVP_get_cipherbyname(SN_aes_128_gcm); 547 EVP_get_cipherbyname(SN_aes_128_gcm);
@@ -627,9 +613,6 @@ ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
627 case SSL_RC4: 613 case SSL_RC4:
628 i = SSL_ENC_RC4_IDX; 614 i = SSL_ENC_RC4_IDX;
629 break; 615 break;
630 case SSL_RC2:
631 i = SSL_ENC_RC2_IDX;
632 break;
633 case SSL_IDEA: 616 case SSL_IDEA:
634 i = SSL_ENC_IDEA_IDX; 617 i = SSL_ENC_IDEA_IDX;
635 break; 618 break;
@@ -651,9 +634,6 @@ ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
651 case SSL_eGOST2814789CNT: 634 case SSL_eGOST2814789CNT:
652 i = SSL_ENC_GOST89_IDX; 635 i = SSL_ENC_GOST89_IDX;
653 break; 636 break;
654 case SSL_SEED:
655 i = SSL_ENC_SEED_IDX;
656 break;
657 case SSL_AES128GCM: 637 case SSL_AES128GCM:
658 i = SSL_ENC_AES128GCM_IDX; 638 i = SSL_ENC_AES128GCM_IDX;
659 break; 639 break;
@@ -860,7 +840,6 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth,
860 *enc |= (ssl_cipher_methods[SSL_ENC_DES_IDX ] == NULL) ? SSL_DES : 0; 840 *enc |= (ssl_cipher_methods[SSL_ENC_DES_IDX ] == NULL) ? SSL_DES : 0;
861 *enc |= (ssl_cipher_methods[SSL_ENC_3DES_IDX] == NULL) ? SSL_3DES : 0; 841 *enc |= (ssl_cipher_methods[SSL_ENC_3DES_IDX] == NULL) ? SSL_3DES : 0;
862 *enc |= (ssl_cipher_methods[SSL_ENC_RC4_IDX ] == NULL) ? SSL_RC4 : 0; 842 *enc |= (ssl_cipher_methods[SSL_ENC_RC4_IDX ] == NULL) ? SSL_RC4 : 0;
863 *enc |= (ssl_cipher_methods[SSL_ENC_RC2_IDX ] == NULL) ? SSL_RC2 : 0;
864 *enc |= (ssl_cipher_methods[SSL_ENC_IDEA_IDX] == NULL) ? SSL_IDEA : 0; 843 *enc |= (ssl_cipher_methods[SSL_ENC_IDEA_IDX] == NULL) ? SSL_IDEA : 0;
865 *enc |= (ssl_cipher_methods[SSL_ENC_AES128_IDX] == NULL) ? SSL_AES128 : 0; 844 *enc |= (ssl_cipher_methods[SSL_ENC_AES128_IDX] == NULL) ? SSL_AES128 : 0;
866 *enc |= (ssl_cipher_methods[SSL_ENC_AES256_IDX] == NULL) ? SSL_AES256 : 0; 845 *enc |= (ssl_cipher_methods[SSL_ENC_AES256_IDX] == NULL) ? SSL_AES256 : 0;
@@ -869,7 +848,6 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth,
869 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA128_IDX] == NULL) ? SSL_CAMELLIA128 : 0; 848 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA128_IDX] == NULL) ? SSL_CAMELLIA128 : 0;
870 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA256_IDX] == NULL) ? SSL_CAMELLIA256 : 0; 849 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA256_IDX] == NULL) ? SSL_CAMELLIA256 : 0;
871 *enc |= (ssl_cipher_methods[SSL_ENC_GOST89_IDX] == NULL) ? SSL_eGOST2814789CNT : 0; 850 *enc |= (ssl_cipher_methods[SSL_ENC_GOST89_IDX] == NULL) ? SSL_eGOST2814789CNT : 0;
872 *enc |= (ssl_cipher_methods[SSL_ENC_SEED_IDX] == NULL) ? SSL_SEED : 0;
873 851
874 *mac |= (ssl_digest_methods[SSL_MD_MD5_IDX ] == NULL) ? SSL_MD5 : 0; 852 *mac |= (ssl_digest_methods[SSL_MD_MD5_IDX ] == NULL) ? SSL_MD5 : 0;
875 *mac |= (ssl_digest_methods[SSL_MD_SHA1_IDX] == NULL) ? SSL_SHA1 : 0; 853 *mac |= (ssl_digest_methods[SSL_MD_SHA1_IDX] == NULL) ? SSL_SHA1 : 0;
@@ -1642,9 +1620,6 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1642 case SSL_RC4: 1620 case SSL_RC4:
1643 enc = alg2 & SSL2_CF_8_BYTE_ENC ? "RC4(64)" : "RC4(128)"; 1621 enc = alg2 & SSL2_CF_8_BYTE_ENC ? "RC4(64)" : "RC4(128)";
1644 break; 1622 break;
1645 case SSL_RC2:
1646 enc = "RC2(128)";
1647 break;
1648 case SSL_IDEA: 1623 case SSL_IDEA:
1649 enc = "IDEA(128)"; 1624 enc = "IDEA(128)";
1650 break; 1625 break;
@@ -1669,9 +1644,6 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1669 case SSL_CAMELLIA256: 1644 case SSL_CAMELLIA256:
1670 enc = "Camellia(256)"; 1645 enc = "Camellia(256)";
1671 break; 1646 break;
1672 case SSL_SEED:
1673 enc = "SEED(128)";
1674 break;
1675 case SSL_CHACHA20POLY1305: 1647 case SSL_CHACHA20POLY1305:
1676 enc = "ChaCha20-Poly1305"; 1648 enc = "ChaCha20-Poly1305";
1677 break; 1649 break;
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index e7bcb890e4..9aa9bc60ff 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/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)
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 4bd085310f..1645f6af49 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_ciph.c,v 1.70 2014/10/15 13:57:21 jsing Exp $ */ 1/* $OpenBSD: ssl_ciph.c,v 1.71 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 *
@@ -150,22 +150,20 @@
150#define SSL_ENC_DES_IDX 0 150#define SSL_ENC_DES_IDX 0
151#define SSL_ENC_3DES_IDX 1 151#define SSL_ENC_3DES_IDX 1
152#define SSL_ENC_RC4_IDX 2 152#define SSL_ENC_RC4_IDX 2
153#define SSL_ENC_RC2_IDX 3 153#define SSL_ENC_IDEA_IDX 3
154#define SSL_ENC_IDEA_IDX 4 154#define SSL_ENC_NULL_IDX 4
155#define SSL_ENC_NULL_IDX 5 155#define SSL_ENC_AES128_IDX 5
156#define SSL_ENC_AES128_IDX 6 156#define SSL_ENC_AES256_IDX 6
157#define SSL_ENC_AES256_IDX 7 157#define SSL_ENC_CAMELLIA128_IDX 7
158#define SSL_ENC_CAMELLIA128_IDX 8 158#define SSL_ENC_CAMELLIA256_IDX 8
159#define SSL_ENC_CAMELLIA256_IDX 9 159#define SSL_ENC_GOST89_IDX 9
160#define SSL_ENC_GOST89_IDX 10 160#define SSL_ENC_AES128GCM_IDX 10
161#define SSL_ENC_SEED_IDX 11 161#define SSL_ENC_AES256GCM_IDX 11
162#define SSL_ENC_AES128GCM_IDX 12 162#define SSL_ENC_NUM_IDX 12
163#define SSL_ENC_AES256GCM_IDX 13
164#define SSL_ENC_NUM_IDX 14
165 163
166 164
167static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = { 165static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
168 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL 166 NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
169}; 167};
170 168
171#define SSL_MD_MD5_IDX 0 169#define SSL_MD_MD5_IDX 0
@@ -380,18 +378,10 @@ static const SSL_CIPHER cipher_aliases[] = {
380 .algorithm_enc = SSL_RC4, 378 .algorithm_enc = SSL_RC4,
381 }, 379 },
382 { 380 {
383 .name = SSL_TXT_RC2,
384 .algorithm_enc = SSL_RC2,
385 },
386 {
387 .name = SSL_TXT_IDEA, 381 .name = SSL_TXT_IDEA,
388 .algorithm_enc = SSL_IDEA, 382 .algorithm_enc = SSL_IDEA,
389 }, 383 },
390 { 384 {
391 .name = SSL_TXT_SEED,
392 .algorithm_enc = SSL_SEED,
393 },
394 {
395 .name = SSL_TXT_eNULL, 385 .name = SSL_TXT_eNULL,
396 .algorithm_enc = SSL_eNULL, 386 .algorithm_enc = SSL_eNULL,
397 }, 387 },
@@ -536,8 +526,6 @@ ssl_load_ciphers(void)
536 EVP_get_cipherbyname(SN_des_ede3_cbc); 526 EVP_get_cipherbyname(SN_des_ede3_cbc);
537 ssl_cipher_methods[SSL_ENC_RC4_IDX]= 527 ssl_cipher_methods[SSL_ENC_RC4_IDX]=
538 EVP_get_cipherbyname(SN_rc4); 528 EVP_get_cipherbyname(SN_rc4);
539 ssl_cipher_methods[SSL_ENC_RC2_IDX]=
540 EVP_get_cipherbyname(SN_rc2_cbc);
541#ifndef OPENSSL_NO_IDEA 529#ifndef OPENSSL_NO_IDEA
542 ssl_cipher_methods[SSL_ENC_IDEA_IDX]= 530 ssl_cipher_methods[SSL_ENC_IDEA_IDX]=
543 EVP_get_cipherbyname(SN_idea_cbc); 531 EVP_get_cipherbyname(SN_idea_cbc);
@@ -554,8 +542,6 @@ ssl_load_ciphers(void)
554 EVP_get_cipherbyname(SN_camellia_256_cbc); 542 EVP_get_cipherbyname(SN_camellia_256_cbc);
555 ssl_cipher_methods[SSL_ENC_GOST89_IDX]= 543 ssl_cipher_methods[SSL_ENC_GOST89_IDX]=
556 EVP_get_cipherbyname(SN_gost89_cnt); 544 EVP_get_cipherbyname(SN_gost89_cnt);
557 ssl_cipher_methods[SSL_ENC_SEED_IDX]=
558 EVP_get_cipherbyname(SN_seed_cbc);
559 545
560 ssl_cipher_methods[SSL_ENC_AES128GCM_IDX]= 546 ssl_cipher_methods[SSL_ENC_AES128GCM_IDX]=
561 EVP_get_cipherbyname(SN_aes_128_gcm); 547 EVP_get_cipherbyname(SN_aes_128_gcm);
@@ -627,9 +613,6 @@ ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
627 case SSL_RC4: 613 case SSL_RC4:
628 i = SSL_ENC_RC4_IDX; 614 i = SSL_ENC_RC4_IDX;
629 break; 615 break;
630 case SSL_RC2:
631 i = SSL_ENC_RC2_IDX;
632 break;
633 case SSL_IDEA: 616 case SSL_IDEA:
634 i = SSL_ENC_IDEA_IDX; 617 i = SSL_ENC_IDEA_IDX;
635 break; 618 break;
@@ -651,9 +634,6 @@ ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
651 case SSL_eGOST2814789CNT: 634 case SSL_eGOST2814789CNT:
652 i = SSL_ENC_GOST89_IDX; 635 i = SSL_ENC_GOST89_IDX;
653 break; 636 break;
654 case SSL_SEED:
655 i = SSL_ENC_SEED_IDX;
656 break;
657 case SSL_AES128GCM: 637 case SSL_AES128GCM:
658 i = SSL_ENC_AES128GCM_IDX; 638 i = SSL_ENC_AES128GCM_IDX;
659 break; 639 break;
@@ -860,7 +840,6 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth,
860 *enc |= (ssl_cipher_methods[SSL_ENC_DES_IDX ] == NULL) ? SSL_DES : 0; 840 *enc |= (ssl_cipher_methods[SSL_ENC_DES_IDX ] == NULL) ? SSL_DES : 0;
861 *enc |= (ssl_cipher_methods[SSL_ENC_3DES_IDX] == NULL) ? SSL_3DES : 0; 841 *enc |= (ssl_cipher_methods[SSL_ENC_3DES_IDX] == NULL) ? SSL_3DES : 0;
862 *enc |= (ssl_cipher_methods[SSL_ENC_RC4_IDX ] == NULL) ? SSL_RC4 : 0; 842 *enc |= (ssl_cipher_methods[SSL_ENC_RC4_IDX ] == NULL) ? SSL_RC4 : 0;
863 *enc |= (ssl_cipher_methods[SSL_ENC_RC2_IDX ] == NULL) ? SSL_RC2 : 0;
864 *enc |= (ssl_cipher_methods[SSL_ENC_IDEA_IDX] == NULL) ? SSL_IDEA : 0; 843 *enc |= (ssl_cipher_methods[SSL_ENC_IDEA_IDX] == NULL) ? SSL_IDEA : 0;
865 *enc |= (ssl_cipher_methods[SSL_ENC_AES128_IDX] == NULL) ? SSL_AES128 : 0; 844 *enc |= (ssl_cipher_methods[SSL_ENC_AES128_IDX] == NULL) ? SSL_AES128 : 0;
866 *enc |= (ssl_cipher_methods[SSL_ENC_AES256_IDX] == NULL) ? SSL_AES256 : 0; 845 *enc |= (ssl_cipher_methods[SSL_ENC_AES256_IDX] == NULL) ? SSL_AES256 : 0;
@@ -869,7 +848,6 @@ ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth,
869 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA128_IDX] == NULL) ? SSL_CAMELLIA128 : 0; 848 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA128_IDX] == NULL) ? SSL_CAMELLIA128 : 0;
870 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA256_IDX] == NULL) ? SSL_CAMELLIA256 : 0; 849 *enc |= (ssl_cipher_methods[SSL_ENC_CAMELLIA256_IDX] == NULL) ? SSL_CAMELLIA256 : 0;
871 *enc |= (ssl_cipher_methods[SSL_ENC_GOST89_IDX] == NULL) ? SSL_eGOST2814789CNT : 0; 850 *enc |= (ssl_cipher_methods[SSL_ENC_GOST89_IDX] == NULL) ? SSL_eGOST2814789CNT : 0;
872 *enc |= (ssl_cipher_methods[SSL_ENC_SEED_IDX] == NULL) ? SSL_SEED : 0;
873 851
874 *mac |= (ssl_digest_methods[SSL_MD_MD5_IDX ] == NULL) ? SSL_MD5 : 0; 852 *mac |= (ssl_digest_methods[SSL_MD_MD5_IDX ] == NULL) ? SSL_MD5 : 0;
875 *mac |= (ssl_digest_methods[SSL_MD_SHA1_IDX] == NULL) ? SSL_SHA1 : 0; 853 *mac |= (ssl_digest_methods[SSL_MD_SHA1_IDX] == NULL) ? SSL_SHA1 : 0;
@@ -1642,9 +1620,6 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1642 case SSL_RC4: 1620 case SSL_RC4:
1643 enc = alg2 & SSL2_CF_8_BYTE_ENC ? "RC4(64)" : "RC4(128)"; 1621 enc = alg2 & SSL2_CF_8_BYTE_ENC ? "RC4(64)" : "RC4(128)";
1644 break; 1622 break;
1645 case SSL_RC2:
1646 enc = "RC2(128)";
1647 break;
1648 case SSL_IDEA: 1623 case SSL_IDEA:
1649 enc = "IDEA(128)"; 1624 enc = "IDEA(128)";
1650 break; 1625 break;
@@ -1669,9 +1644,6 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1669 case SSL_CAMELLIA256: 1644 case SSL_CAMELLIA256:
1670 enc = "Camellia(256)"; 1645 enc = "Camellia(256)";
1671 break; 1646 break;
1672 case SSL_SEED:
1673 enc = "SEED(128)";
1674 break;
1675 case SSL_CHACHA20POLY1305: 1647 case SSL_CHACHA20POLY1305:
1676 enc = "ChaCha20-Poly1305"; 1648 enc = "ChaCha20-Poly1305";
1677 break; 1649 break;
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)
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 00:11:04 +0000