mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove CBC from RABBIT suite naming

Browse Source
This commit is contained in:
toddouska 2013-10-24 11:52:21 -07:00
parent 4c04b6e714
commit f833674171
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -683,8 +683,8 @@ Release Candidate 2 for CyaSSL 1.0.0 adds bug fixes and adds two new stream
ciphers along with their respective cipher suites. CyaSSL adds support for ciphers along with their respective cipher suites. CyaSSL adds support for
HC-128 and RABBIT stream ciphers. The new suites are: HC-128 and RABBIT stream ciphers. The new suites are:
TLS_RSA_WITH_HC_128_CBC_SHA TLS_RSA_WITH_HC_128_SHA
TLS_RSA_WITH_RABBIT_CBC_SHA TLS_RSA_WITH_RABBIT_SHA
And the corresponding cipher names are And the corresponding cipher names are

6
cyassl/internal.h
View File

@ -266,7 +266,7 @@ void c32to24(word32 in, word24 out);
#if !defined(NO_RABBIT) && !defined(NO_TLS) && !defined(NO_RSA) #if !defined(NO_RABBIT) && !defined(NO_TLS) && !defined(NO_RSA)
#if !defined(NO_SHA) #if !defined(NO_SHA)
#define BUILD_TLS_RSA_WITH_RABBIT_CBC_SHA #define BUILD_TLS_RSA_WITH_RABBIT_SHA
#endif #endif
#endif #endif
@ -395,7 +395,7 @@ void c32to24(word32 in, word24 out);
#define BUILD_HC128 #define BUILD_HC128
#endif #endif
#if defined(BUILD_TLS_RSA_WITH_RABBIT_CBC_SHA) #if defined(BUILD_TLS_RSA_WITH_RABBIT_SHA)
#define BUILD_RABBIT #define BUILD_RABBIT
#endif #endif
@ -472,7 +472,7 @@ enum {
/* CyaSSL extension - eSTREAM */ /* CyaSSL extension - eSTREAM */
TLS_RSA_WITH_HC_128_CBC_MD5 = 0xFB, TLS_RSA_WITH_HC_128_CBC_MD5 = 0xFB,
TLS_RSA_WITH_HC_128_CBC_SHA = 0xFC, TLS_RSA_WITH_HC_128_CBC_SHA = 0xFC,
TLS_RSA_WITH_RABBIT_CBC_SHA = 0xFD, TLS_RSA_WITH_RABBIT_SHA = 0xFD,
/* CyaSSL extension - Blake2b 256 */ /* CyaSSL extension - Blake2b 256 */
TLS_RSA_WITH_AES_128_CBC_B2B256 = 0xF8, TLS_RSA_WITH_AES_128_CBC_B2B256 = 0xF8,

12
src/internal.c
View File

@ -1126,10 +1126,10 @@ void InitSuites(Suites* suites, ProtocolVersion pv, byte haveRSA, byte havePSK,
} }
#endif #endif
#ifdef BUILD_TLS_RSA_WITH_RABBIT_CBC_SHA #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA
if (tls && haveRSA) { if (tls && haveRSA) {
suites->suites[idx++] = 0; suites->suites[idx++] = 0;
suites->suites[idx++] = TLS_RSA_WITH_RABBIT_CBC_SHA; suites->suites[idx++] = TLS_RSA_WITH_RABBIT_SHA;
} }
#endif #endif
@ -6175,7 +6175,7 @@ const char* const cipher_names[] =
"AES256-B2B256", "AES256-B2B256",
#endif #endif
#ifdef BUILD_TLS_RSA_WITH_RABBIT_CBC_SHA #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA
"RABBIT-SHA", "RABBIT-SHA",
#endif #endif
@ -6495,8 +6495,8 @@ int cipher_name_idx[] =
TLS_RSA_WITH_AES_256_CBC_B2B256, TLS_RSA_WITH_AES_256_CBC_B2B256,
#endif #endif
#ifdef BUILD_TLS_RSA_WITH_RABBIT_CBC_SHA #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA
TLS_RSA_WITH_RABBIT_CBC_SHA, TLS_RSA_WITH_RABBIT_SHA,
#endif #endif
#ifdef BUILD_TLS_NTRU_RSA_WITH_RC4_128_SHA #ifdef BUILD_TLS_NTRU_RSA_WITH_RC4_128_SHA
@ -9361,7 +9361,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
return 1; return 1;
break; break;
case TLS_RSA_WITH_RABBIT_CBC_SHA : case TLS_RSA_WITH_RABBIT_SHA :
if (requirement == REQUIRES_RSA) if (requirement == REQUIRES_RSA)
return 1; return 1;
break; break;

4
src/keys.c
View File

@ -1173,8 +1173,8 @@ int SetCipherSpecs(CYASSL* ssl)
break; break;
#endif #endif
#ifdef BUILD_TLS_RSA_WITH_RABBIT_CBC_SHA #ifdef BUILD_TLS_RSA_WITH_RABBIT_SHA
case TLS_RSA_WITH_RABBIT_CBC_SHA : case TLS_RSA_WITH_RABBIT_SHA :
ssl->specs.bulk_cipher_algorithm = cyassl_rabbit; ssl->specs.bulk_cipher_algorithm = cyassl_rabbit;
ssl->specs.cipher_type = stream; ssl->specs.cipher_type = stream;
ssl->specs.mac_algorithm = sha_mac; ssl->specs.mac_algorithm = sha_mac;

4
src/ssl.c
View File

@ -7594,8 +7594,8 @@ CYASSL_X509* CyaSSL_X509_load_certificate_file(const char* fname, int format)
#endif /* NO_HC128 */ #endif /* NO_HC128 */
#ifndef NO_SHA #ifndef NO_SHA
#ifndef NO_RABBIT #ifndef NO_RABBIT
case TLS_RSA_WITH_RABBIT_CBC_SHA : case TLS_RSA_WITH_RABBIT_SHA :
return "TLS_RSA_WITH_RABBIT_CBC_SHA"; return "TLS_RSA_WITH_RABBIT_SHA";
#endif #endif
#ifdef HAVE_NTRU #ifdef HAVE_NTRU
#ifndef NO_RC4 #ifndef NO_RC4