Revision aa3b4b4d deps/openssl/openssl/ssl/ssl_ciph.c
| deps/openssl/openssl/ssl/ssl_ciph.c | ||
|---|---|---|
| 270 | 270 |
{0,SSL_TXT_aGOST94,0,0,SSL_aGOST94,0,0,0,0,0,0,0},
|
| 271 | 271 |
{0,SSL_TXT_aGOST01,0,0,SSL_aGOST01,0,0,0,0,0,0,0},
|
| 272 | 272 |
{0,SSL_TXT_aGOST,0,0,SSL_aGOST94|SSL_aGOST01,0,0,0,0,0,0,0},
|
| 273 |
{0,SSL_TXT_aSRP,0, 0,SSL_aSRP, 0,0,0,0,0,0,0},
|
|
| 273 | 274 |
|
| 274 | 275 |
/* aliases combining key exchange and server authentication */ |
| 275 | 276 |
{0,SSL_TXT_EDH,0, SSL_kEDH,~SSL_aNULL,0,0,0,0,0,0,0},
|
| ... | ... | |
| 562 | 563 |
break; |
| 563 | 564 |
} |
| 564 | 565 |
|
| 565 |
if ((i < 0) || (i > SSL_ENC_NUM_IDX)) |
|
| 566 |
if ((i < 0) || (i >= SSL_ENC_NUM_IDX))
|
|
| 566 | 567 |
*enc=NULL; |
| 567 | 568 |
else |
| 568 | 569 |
{
|
| ... | ... | |
| 596 | 597 |
i= -1; |
| 597 | 598 |
break; |
| 598 | 599 |
} |
| 599 |
if ((i < 0) || (i > SSL_MD_NUM_IDX)) |
|
| 600 |
if ((i < 0) || (i >= SSL_MD_NUM_IDX))
|
|
| 600 | 601 |
{
|
| 601 | 602 |
*md=NULL; |
| 602 | 603 |
if (mac_pkey_type!=NULL) *mac_pkey_type = NID_undef; |
| ... | ... | |
| 925 | 926 |
int rule, int strength_bits, |
| 926 | 927 |
CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p) |
| 927 | 928 |
{
|
| 928 |
CIPHER_ORDER *head, *tail, *curr, *curr2, *last;
|
|
| 929 |
CIPHER_ORDER *head, *tail, *curr, *next, *last;
|
|
| 929 | 930 |
const SSL_CIPHER *cp; |
| 930 | 931 |
int reverse = 0; |
| 931 | 932 |
|
| ... | ... | |
| 942 | 943 |
|
| 943 | 944 |
if (reverse) |
| 944 | 945 |
{
|
| 945 |
curr = tail;
|
|
| 946 |
next = tail;
|
|
| 946 | 947 |
last = head; |
| 947 | 948 |
} |
| 948 | 949 |
else |
| 949 | 950 |
{
|
| 950 |
curr = head;
|
|
| 951 |
next = head;
|
|
| 951 | 952 |
last = tail; |
| 952 | 953 |
} |
| 953 | 954 |
|
| 954 |
curr2 = curr;
|
|
| 955 |
curr = NULL;
|
|
| 955 | 956 |
for (;;) |
| 956 | 957 |
{
|
| 957 |
if ((curr == NULL) || (curr == last)) break; |
|
| 958 |
curr = curr2; |
|
| 959 |
curr2 = reverse ? curr->prev : curr->next; |
|
| 958 |
if (curr == last) break; |
|
| 959 |
|
|
| 960 |
curr = next; |
|
| 961 |
|
|
| 962 |
if (curr == NULL) break; |
|
| 963 |
|
|
| 964 |
next = reverse ? curr->prev : curr->next; |
|
| 960 | 965 |
|
| 961 | 966 |
cp = curr->cipher; |
| 962 | 967 |
|
| ... | ... | |
| 1598 | 1603 |
case SSL_kSRP: |
| 1599 | 1604 |
kx="SRP"; |
| 1600 | 1605 |
break; |
| 1606 |
case SSL_kGOST: |
|
| 1607 |
kx="GOST"; |
|
| 1608 |
break; |
|
| 1601 | 1609 |
default: |
| 1602 | 1610 |
kx="unknown"; |
| 1603 | 1611 |
} |
| ... | ... | |
| 1628 | 1636 |
case SSL_aPSK: |
| 1629 | 1637 |
au="PSK"; |
| 1630 | 1638 |
break; |
| 1639 |
case SSL_aSRP: |
|
| 1640 |
au="SRP"; |
|
| 1641 |
break; |
|
| 1642 |
case SSL_aGOST94: |
|
| 1643 |
au="GOST94"; |
|
| 1644 |
break; |
|
| 1645 |
case SSL_aGOST01: |
|
| 1646 |
au="GOST01"; |
|
| 1647 |
break; |
|
| 1631 | 1648 |
default: |
| 1632 | 1649 |
au="unknown"; |
| 1633 | 1650 |
break; |
| ... | ... | |
| 1675 | 1692 |
case SSL_SEED: |
| 1676 | 1693 |
enc="SEED(128)"; |
| 1677 | 1694 |
break; |
| 1695 |
case SSL_eGOST2814789CNT: |
|
| 1696 |
enc="GOST89(256)"; |
|
| 1697 |
break; |
|
| 1678 | 1698 |
default: |
| 1679 | 1699 |
enc="unknown"; |
| 1680 | 1700 |
break; |
| ... | ... | |
| 1697 | 1717 |
case SSL_AEAD: |
| 1698 | 1718 |
mac="AEAD"; |
| 1699 | 1719 |
break; |
| 1720 |
case SSL_GOST89MAC: |
|
| 1721 |
mac="GOST89"; |
|
| 1722 |
break; |
|
| 1723 |
case SSL_GOST94: |
|
| 1724 |
mac="GOST94"; |
|
| 1725 |
break; |
|
| 1700 | 1726 |
default: |
| 1701 | 1727 |
mac="unknown"; |
| 1702 | 1728 |
break; |
Also available in: Unified diff