projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add names of GOST algorithms.
[openssl.git]
/
ssl
/
ssl_ciph.c
diff --git
a/ssl/ssl_ciph.c
b/ssl/ssl_ciph.c
index ad9b762101951ead9d455e39a1c0671cead0d66f..bc19da1c96e7d6b99e4abb285a4ee620c994f14a 100644
(file)
--- a/
ssl/ssl_ciph.c
+++ b/
ssl/ssl_ciph.c
@@
-954,7
+954,7
@@
static void ssl_cipher_apply_rule(unsigned long cipher_id,
int rule, int strength_bits,
CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
{
int rule, int strength_bits,
CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
{
- CIPHER_ORDER *head, *tail, *curr, *
curr2
, *last;
+ CIPHER_ORDER *head, *tail, *curr, *
next
, *last;
const SSL_CIPHER *cp;
int reverse = 0;
const SSL_CIPHER *cp;
int reverse = 0;
@@
-971,21
+971,25
@@
static void ssl_cipher_apply_rule(unsigned long cipher_id,
if (reverse)
{
if (reverse)
{
-
curr
= tail;
+
next
= tail;
last = head;
}
else
{
last = head;
}
else
{
-
curr
= head;
+
next
= head;
last = tail;
}
last = tail;
}
- curr
2 = curr
;
+ curr
= NULL
;
for (;;)
{
for (;;)
{
- if ((curr == NULL) || (curr == last)) break;
- curr = curr2;
- curr2 = reverse ? curr->prev : curr->next;
+ if (curr == last) break;
+
+ curr = next;
+
+ if (curr == NULL) break;
+
+ next = reverse ? curr->prev : curr->next;
cp = curr->cipher;
cp = curr->cipher;
@@
-1710,6
+1714,9
@@
char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_kSRP:
kx="SRP";
break;
case SSL_kSRP:
kx="SRP";
break;
+ case SSL_kGOST:
+ kx="VKO";
+ break;
default:
kx="unknown";
}
default:
kx="unknown";
}
@@
-1743,6
+1750,12
@@
char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_aSRP:
au="SRP";
break;
case SSL_aSRP:
au="SRP";
break;
+ case SSL_aGOST94:
+ au="GOST94";
+ break;
+ case SSL_aGOST01:
+ au="GOST01";
+ break;
default:
au="unknown";
break;
default:
au="unknown";
break;
@@
-1790,6
+1803,9
@@
char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_SEED:
enc="SEED(128)";
break;
case SSL_SEED:
enc="SEED(128)";
break;
+ case SSL_eGOST2814789CNT:
+ enc="GOST89(256)";
+ break;
default:
enc="unknown";
break;
default:
enc="unknown";
break;
@@
-1812,6
+1828,12
@@
char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_AEAD:
mac="AEAD";
break;
case SSL_AEAD:
mac="AEAD";
break;
+ case SSL_GOST89MAC:
+ mac="GOST89";
+ break;
+ case SSL_GOST94:
+ mac="GOST94";
+ break;
default:
mac="unknown";
break;
default:
mac="unknown";
break;