From abbf2b764c6fd2339c9e4fbc4647072087683f48 Mon Sep 17 00:00:00 2001 From: lloyd Date: Fri, 19 Apr 2013 14:56:02 +0000 Subject: Rename ARC4 to RC4 --- src/build-data/scripts/tls_suite_info.py | 8 +-- src/engine/core_engine/lookup_stream.cpp | 12 ++-- src/engine/openssl/ossl_arc4.cpp | 32 ++++----- src/libstate/policy.cpp | 3 +- src/stream/arc4/arc4.cpp | 109 ------------------------------- src/stream/arc4/arc4.h | 55 ---------------- src/stream/arc4/info.txt | 1 - src/stream/rc4/info.txt | 1 + src/stream/rc4/rc4.cpp | 109 +++++++++++++++++++++++++++++++ src/stream/rc4/rc4.h | 55 ++++++++++++++++ src/tls/info.txt | 5 +- src/tls/tls_ciphersuite.cpp | 2 +- src/tls/tls_policy.cpp | 4 +- src/tls/tls_suite_info.cpp | 22 +++---- 14 files changed, 209 insertions(+), 209 deletions(-) delete mode 100644 src/stream/arc4/arc4.cpp delete mode 100644 src/stream/arc4/arc4.h delete mode 100644 src/stream/arc4/info.txt create mode 100644 src/stream/rc4/info.txt create mode 100644 src/stream/rc4/rc4.cpp create mode 100644 src/stream/rc4/rc4.h (limited to 'src') diff --git a/src/build-data/scripts/tls_suite_info.py b/src/build-data/scripts/tls_suite_info.py index 7043469d2..8c454f35a 100755 --- a/src/build-data/scripts/tls_suite_info.py +++ b/src/build-data/scripts/tls_suite_info.py @@ -42,7 +42,7 @@ def to_ciphersuite_info(code, name): cipher = cipher_and_mac[:-1] cipher_info = { - 'RC4': ('ARC4',None), + 'RC4': ('RC4',None), 'IDEA': ('IDEA',16), 'DES': ('DES',8), '3DES': ('3DES',24), @@ -59,7 +59,7 @@ def to_ciphersuite_info(code, name): 'SHA256': 'SHA-256', 'SHA384': 'SHA-384', 'SHA512': 'SHA-512', - 'RC4': 'ARC4', + 'RC4': 'RC4', '3DES': 'TripleDES', 'DSS': 'DSA', 'ECDSA': 'ECDSA', @@ -98,7 +98,7 @@ def to_ciphersuite_info(code, name): modestr = '' mode = '' ivlen = 0 - if cipher_algo != 'ARC4': + if cipher_algo != 'RC4': mode = cipher[-1] if mode not in ['CBC', 'GCM', 'CCM', 'OCB']: print "#warning Unknown mode %s" % (' '.join(cipher)) @@ -108,7 +108,7 @@ def to_ciphersuite_info(code, name): if mode != 'CBC': cipher_algo += '/' + mode - if cipher_algo != 'ARC4' and mode != 'CBC': + if cipher_algo != 'RC4' and mode != 'CBC': return 'Ciphersuite(0x%s, "%s", "%s", "%s", %d, %d, "AEAD", %d, "%s")' % ( code, sig_algo, kex_algo, cipher_algo, cipher_keylen, 4, 0, mac_algo) else: diff --git a/src/engine/core_engine/lookup_stream.cpp b/src/engine/core_engine/lookup_stream.cpp index 683ee6b8c..b26bbedcd 100644 --- a/src/engine/core_engine/lookup_stream.cpp +++ b/src/engine/core_engine/lookup_stream.cpp @@ -8,8 +8,8 @@ #include #include -#if defined(BOTAN_HAS_ARC4) - #include +#if defined(BOTAN_HAS_RC4) + #include #endif #if defined(BOTAN_HAS_SALSA20) @@ -25,11 +25,11 @@ StreamCipher* Core_Engine::find_stream_cipher(const SCAN_Name& request, Algorithm_Factory&) const { -#if defined(BOTAN_HAS_ARC4) - if(request.algo_name() == "ARC4") - return new ARC4(request.arg_as_integer(0, 0)); +#if defined(BOTAN_HAS_RC4) + if(request.algo_name() == "RC4") + return new RC4(request.arg_as_integer(0, 0)); if(request.algo_name() == "RC4_drop") - return new ARC4(768); + return new RC4(768); #endif #if defined(BOTAN_HAS_SALSA20) diff --git a/src/engine/openssl/ossl_arc4.cpp b/src/engine/openssl/ossl_arc4.cpp index cad194a59..0eb404af1 100644 --- a/src/engine/openssl/ossl_arc4.cpp +++ b/src/engine/openssl/ossl_arc4.cpp @@ -1,5 +1,5 @@ /* -* OpenSSL ARC4 +* OpenSSL RC4 * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license @@ -14,15 +14,15 @@ namespace Botan { namespace { /** -* ARC4 as implemented by OpenSSL +* RC4 as implemented by OpenSSL */ -class ARC4_OpenSSL : public StreamCipher +class RC4_OpenSSL : public StreamCipher { public: void clear() { clear_mem(&state, 1); } std::string name() const; - StreamCipher* clone() const { return new ARC4_OpenSSL(SKIP); } + StreamCipher* clone() const { return new RC4_OpenSSL(SKIP); } Key_Length_Specification key_spec() const { @@ -30,8 +30,8 @@ class ARC4_OpenSSL : public StreamCipher } - ARC4_OpenSSL(size_t s = 0) : SKIP(s) { clear(); } - ~ARC4_OpenSSL() { clear(); } + RC4_OpenSSL(size_t s = 0) : SKIP(s) { clear(); } + ~RC4_OpenSSL() { clear(); } private: void cipher(const byte[], byte[], size_t); void key_schedule(const byte[], size_t); @@ -43,17 +43,17 @@ class ARC4_OpenSSL : public StreamCipher /* * Return the name of this type */ -std::string ARC4_OpenSSL::name() const +std::string RC4_OpenSSL::name() const { - if(SKIP == 0) return "ARC4"; + if(SKIP == 0) return "RC4"; if(SKIP == 256) return "MARK-4"; else return "RC4_skip(" + std::to_string(SKIP) + ")"; } /* -* ARC4 Key Schedule +* RC4 Key Schedule */ -void ARC4_OpenSSL::key_schedule(const byte key[], size_t length) +void RC4_OpenSSL::key_schedule(const byte key[], size_t length) { RC4_set_key(&state, length, key); byte dummy = 0; @@ -62,9 +62,9 @@ void ARC4_OpenSSL::key_schedule(const byte key[], size_t length) } /* -* ARC4 Encryption +* RC4 Encryption */ -void ARC4_OpenSSL::cipher(const byte in[], byte out[], size_t length) +void RC4_OpenSSL::cipher(const byte in[], byte out[], size_t length) { RC4(&state, length, in, out); } @@ -72,16 +72,16 @@ void ARC4_OpenSSL::cipher(const byte in[], byte out[], size_t length) } /** -* Look for an OpenSSL-supported stream cipher (ARC4) +* Look for an OpenSSL-supported stream cipher (RC4) */ StreamCipher* OpenSSL_Engine::find_stream_cipher(const SCAN_Name& request, Algorithm_Factory&) const { - if(request.algo_name() == "ARC4") - return new ARC4_OpenSSL(request.arg_as_integer(0, 0)); + if(request.algo_name() == "RC4") + return new RC4_OpenSSL(request.arg_as_integer(0, 0)); if(request.algo_name() == "RC4_drop") - return new ARC4_OpenSSL(768); + return new RC4_OpenSSL(768); return 0; } diff --git a/src/libstate/policy.cpp b/src/libstate/policy.cpp index 75b7c0db8..172da27f4 100644 --- a/src/libstate/policy.cpp +++ b/src/libstate/policy.cpp @@ -290,7 +290,8 @@ void set_default_aliases(Library_State& config) config.add_alias("CAST5", "CAST-128"); config.add_alias("SHA1", "SHA-160"); config.add_alias("SHA-1", "SHA-160"); - config.add_alias("MARK-4", "ARC4(256)"); + config.add_alias("MARK-4", "RC4(256)"); + config.add_alias("ARC4", "RC4"); config.add_alias("OMAC", "CMAC"); config.add_alias("GOST", "GOST-28147-89"); config.add_alias("GOST-34.11", "GOST-R-34.11-94"); diff --git a/src/stream/arc4/arc4.cpp b/src/stream/arc4/arc4.cpp deleted file mode 100644 index da1694a96..000000000 --- a/src/stream/arc4/arc4.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* -* ARC4 -* (C) 1999-2007 Jack Lloyd -* -* Distributed under the terms of the Botan license -*/ - -#include -#include -#include - -namespace Botan { - -/* -* Combine cipher stream with message -*/ -void ARC4::cipher(const byte in[], byte out[], size_t length) - { - while(length >= buffer.size() - position) - { - xor_buf(out, in, &buffer[position], buffer.size() - position); - length -= (buffer.size() - position); - in += (buffer.size() - position); - out += (buffer.size() - position); - generate(); - } - xor_buf(out, in, &buffer[position], length); - position += length; - } - -/* -* Generate cipher stream -*/ -void ARC4::generate() - { - byte SX, SY; - for(size_t i = 0; i != buffer.size(); i += 4) - { - SX = state[X+1]; Y = (Y + SX) % 256; SY = state[Y]; - state[X+1] = SY; state[Y] = SX; - buffer[i] = state[(SX + SY) % 256]; - - SX = state[X+2]; Y = (Y + SX) % 256; SY = state[Y]; - state[X+2] = SY; state[Y] = SX; - buffer[i+1] = state[(SX + SY) % 256]; - - SX = state[X+3]; Y = (Y + SX) % 256; SY = state[Y]; - state[X+3] = SY; state[Y] = SX; - buffer[i+2] = state[(SX + SY) % 256]; - - X = (X + 4) % 256; - SX = state[X]; Y = (Y + SX) % 256; SY = state[Y]; - state[X] = SY; state[Y] = SX; - buffer[i+3] = state[(SX + SY) % 256]; - } - position = 0; - } - -/* -* ARC4 Key Schedule -*/ -void ARC4::key_schedule(const byte key[], size_t length) - { - state.resize(256); - buffer.resize(round_up(DEFAULT_BUFFERSIZE, 4)); - - position = X = Y = 0; - - for(size_t i = 0; i != 256; ++i) - state[i] = static_cast(i); - - for(size_t i = 0, state_index = 0; i != 256; ++i) - { - state_index = (state_index + key[i % length] + state[i]) % 256; - std::swap(state[i], state[state_index]); - } - - for(size_t i = 0; i <= SKIP; i += buffer.size()) - generate(); - - position += (SKIP % buffer.size()); - } - -/* -* Return the name of this type -*/ -std::string ARC4::name() const - { - if(SKIP == 0) return "ARC4"; - if(SKIP == 256) return "MARK-4"; - else return "RC4_skip(" + std::to_string(SKIP) + ")"; - } - -/* -* Clear memory of sensitive data -*/ -void ARC4::clear() - { - zap(state); - zap(buffer); - position = X = Y = 0; - } - -/* -* ARC4 Constructor -*/ -ARC4::ARC4(size_t s) : SKIP(s) {} - -} diff --git a/src/stream/arc4/arc4.h b/src/stream/arc4/arc4.h deleted file mode 100644 index 8f8de87b6..000000000 --- a/src/stream/arc4/arc4.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -* ARC4 -* (C) 1999-2008 Jack Lloyd -* -* Distributed under the terms of the Botan license -*/ - -#ifndef BOTAN_ARC4_H__ -#define BOTAN_ARC4_H__ - -#include -#include - -namespace Botan { - -/** -* Alleged RC4 -*/ -class BOTAN_DLL ARC4 : public StreamCipher - { - public: - void cipher(const byte in[], byte out[], size_t length); - - void clear(); - std::string name() const; - - StreamCipher* clone() const { return new ARC4(SKIP); } - - Key_Length_Specification key_spec() const - { - return Key_Length_Specification(1, 256); - } - - /** - * @param skip skip this many initial bytes in the keystream - */ - ARC4(size_t skip = 0); - - ~ARC4() { clear(); } - private: - void key_schedule(const byte[], size_t); - void generate(); - - const size_t SKIP; - - byte X, Y; - secure_vector state; - - secure_vector buffer; - size_t position; - }; - -} - -#endif diff --git a/src/stream/arc4/info.txt b/src/stream/arc4/info.txt deleted file mode 100644 index e3022925c..000000000 --- a/src/stream/arc4/info.txt +++ /dev/null @@ -1 +0,0 @@ -define ARC4 diff --git a/src/stream/rc4/info.txt b/src/stream/rc4/info.txt new file mode 100644 index 000000000..587a5fea8 --- /dev/null +++ b/src/stream/rc4/info.txt @@ -0,0 +1 @@ +define RC4 diff --git a/src/stream/rc4/rc4.cpp b/src/stream/rc4/rc4.cpp new file mode 100644 index 000000000..bd4c710a9 --- /dev/null +++ b/src/stream/rc4/rc4.cpp @@ -0,0 +1,109 @@ +/* +* RC4 +* (C) 1999-2007 Jack Lloyd +* +* Distributed under the terms of the Botan license +*/ + +#include +#include +#include + +namespace Botan { + +/* +* Combine cipher stream with message +*/ +void RC4::cipher(const byte in[], byte out[], size_t length) + { + while(length >= buffer.size() - position) + { + xor_buf(out, in, &buffer[position], buffer.size() - position); + length -= (buffer.size() - position); + in += (buffer.size() - position); + out += (buffer.size() - position); + generate(); + } + xor_buf(out, in, &buffer[position], length); + position += length; + } + +/* +* Generate cipher stream +*/ +void RC4::generate() + { + byte SX, SY; + for(size_t i = 0; i != buffer.size(); i += 4) + { + SX = state[X+1]; Y = (Y + SX) % 256; SY = state[Y]; + state[X+1] = SY; state[Y] = SX; + buffer[i] = state[(SX + SY) % 256]; + + SX = state[X+2]; Y = (Y + SX) % 256; SY = state[Y]; + state[X+2] = SY; state[Y] = SX; + buffer[i+1] = state[(SX + SY) % 256]; + + SX = state[X+3]; Y = (Y + SX) % 256; SY = state[Y]; + state[X+3] = SY; state[Y] = SX; + buffer[i+2] = state[(SX + SY) % 256]; + + X = (X + 4) % 256; + SX = state[X]; Y = (Y + SX) % 256; SY = state[Y]; + state[X] = SY; state[Y] = SX; + buffer[i+3] = state[(SX + SY) % 256]; + } + position = 0; + } + +/* +* RC4 Key Schedule +*/ +void RC4::key_schedule(const byte key[], size_t length) + { + state.resize(256); + buffer.resize(round_up(DEFAULT_BUFFERSIZE, 4)); + + position = X = Y = 0; + + for(size_t i = 0; i != 256; ++i) + state[i] = static_cast(i); + + for(size_t i = 0, state_index = 0; i != 256; ++i) + { + state_index = (state_index + key[i % length] + state[i]) % 256; + std::swap(state[i], state[state_index]); + } + + for(size_t i = 0; i <= SKIP; i += buffer.size()) + generate(); + + position += (SKIP % buffer.size()); + } + +/* +* Return the name of this type +*/ +std::string RC4::name() const + { + if(SKIP == 0) return "RC4"; + if(SKIP == 256) return "MARK-4"; + else return "RC4_skip(" + std::to_string(SKIP) + ")"; + } + +/* +* Clear memory of sensitive data +*/ +void RC4::clear() + { + zap(state); + zap(buffer); + position = X = Y = 0; + } + +/* +* RC4 Constructor +*/ +RC4::RC4(size_t s) : SKIP(s) {} + +} diff --git a/src/stream/rc4/rc4.h b/src/stream/rc4/rc4.h new file mode 100644 index 000000000..c23f8c853 --- /dev/null +++ b/src/stream/rc4/rc4.h @@ -0,0 +1,55 @@ +/* +* RC4 +* (C) 1999-2008 Jack Lloyd +* +* Distributed under the terms of the Botan license +*/ + +#ifndef BOTAN_RC4_H__ +#define BOTAN_RC4_H__ + +#include +#include + +namespace Botan { + +/** +* RC4 stream cipher +*/ +class BOTAN_DLL RC4 : public StreamCipher + { + public: + void cipher(const byte in[], byte out[], size_t length); + + void clear(); + std::string name() const; + + StreamCipher* clone() const { return new RC4(SKIP); } + + Key_Length_Specification key_spec() const + { + return Key_Length_Specification(1, 256); + } + + /** + * @param skip skip this many initial bytes in the keystream + */ + RC4(size_t skip = 0); + + ~RC4() { clear(); } + private: + void key_schedule(const byte[], size_t); + void generate(); + + const size_t SKIP; + + byte X, Y; + secure_vector state; + + secure_vector buffer; + size_t position; + }; + +} + +#endif diff --git a/src/tls/info.txt b/src/tls/info.txt index 5bc64b44e..2440baa99 100644 --- a/src/tls/info.txt +++ b/src/tls/info.txt @@ -71,7 +71,6 @@ tls_version.cpp aes -arc4 asn1 camellia cbc @@ -83,18 +82,18 @@ ecdh ecdsa eme_pkcs emsa3 -filters hmac kdf2 md5 prf_ssl3 prf_tls +rc4 rng rsa seed -srp6 sha1 sha2_32 +srp6 ssl3mac x509 diff --git a/src/tls/tls_ciphersuite.cpp b/src/tls/tls_ciphersuite.cpp index 9c9950818..9718a5b08 100644 --- a/src/tls/tls_ciphersuite.cpp +++ b/src/tls/tls_ciphersuite.cpp @@ -96,7 +96,7 @@ std::string Ciphersuite::to_string() const out << "WITH_"; - if(cipher_algo() == "ARC4") + if(cipher_algo() == "RC4") { out << "RC4_128_"; } diff --git a/src/tls/tls_policy.cpp b/src/tls/tls_policy.cpp index 230b02ad0..15e061da8 100644 --- a/src/tls/tls_policy.cpp +++ b/src/tls/tls_policy.cpp @@ -22,7 +22,7 @@ std::vector Policy::allowed_ciphers() const "AES-128/GCM", "AES-256", "AES-128", - "ARC4", + "RC4", //"Camellia-256", //"Camellia-128", //"SEED" @@ -228,7 +228,7 @@ std::vector Policy::ciphersuite_list(Protocol_Version version, if(!have_srp && suite.kex_algo() == "SRP_SHA") continue; - if(version.is_datagram_protocol() && suite.cipher_algo() == "ARC4") + if(version.is_datagram_protocol() && suite.cipher_algo() == "RC4") continue; if(!version.supports_aead_modes() && suite.mac_algo() == "AEAD") diff --git a/src/tls/tls_suite_info.cpp b/src/tls/tls_suite_info.cpp index dcc5d69b4..a2a371063 100644 --- a/src/tls/tls_suite_info.cpp +++ b/src/tls/tls_suite_info.cpp @@ -2,7 +2,7 @@ * TLS cipher suite information * * This file was automatically generated from the IANA assignments -* by ./src/build-data/scripts/tls_suite_info.py on 2013-04-12 +* by ./src/build-data/scripts/tls_suite_info.py on 2013-04-19 * * Released under the terms of the Botan license */ @@ -57,7 +57,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC081, "DSA", "DH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0x0066: // DHE_DSS_WITH_RC4_128_SHA - return Ciphersuite(0x0066, "DSA", "DH", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0x0066, "DSA", "DH", "RC4", 16, 0, "SHA-1", 20); case 0x0099: // DHE_DSS_WITH_SEED_CBC_SHA return Ciphersuite(0x0099, "DSA", "DH", "SEED", 16, 16, "SHA-1", 20); @@ -96,7 +96,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC091, "", "DHE_PSK", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0x008E: // DHE_PSK_WITH_RC4_128_SHA - return Ciphersuite(0x008E, "", "DHE_PSK", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0x008E, "", "DHE_PSK", "RC4", 16, 0, "SHA-1", 20); case 0x0016: // DHE_RSA_WITH_3DES_EDE_CBC_SHA return Ciphersuite(0x0016, "RSA", "DH", "3DES", 24, 8, "SHA-1", 20); @@ -180,7 +180,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC085, "", "DH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0x0018: // DH_anon_WITH_RC4_128_MD5 - return Ciphersuite(0x0018, "", "DH", "ARC4", 16, 0, "MD5", 16); + return Ciphersuite(0x0018, "", "DH", "RC4", 16, 0, "MD5", 16); case 0x009B: // DH_anon_WITH_SEED_CBC_SHA return Ciphersuite(0x009B, "", "DH", "SEED", 16, 16, "SHA-1", 20); @@ -219,7 +219,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC087, "ECDSA", "ECDH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0xC007: // ECDHE_ECDSA_WITH_RC4_128_SHA - return Ciphersuite(0xC007, "ECDSA", "ECDH", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0xC007, "ECDSA", "ECDH", "RC4", 16, 0, "SHA-1", 20); case 0xC034: // ECDHE_PSK_WITH_3DES_EDE_CBC_SHA return Ciphersuite(0xC034, "", "ECDHE_PSK", "3DES", 24, 8, "SHA-1", 20); @@ -243,7 +243,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC09B, "", "ECDHE_PSK", "Camellia-256", 32, 16, "SHA-384", 48); case 0xC033: // ECDHE_PSK_WITH_RC4_128_SHA - return Ciphersuite(0xC033, "", "ECDHE_PSK", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0xC033, "", "ECDHE_PSK", "RC4", 16, 0, "SHA-1", 20); case 0xC012: // ECDHE_RSA_WITH_3DES_EDE_CBC_SHA return Ciphersuite(0xC012, "RSA", "ECDH", "3DES", 24, 8, "SHA-1", 20); @@ -279,7 +279,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC08B, "RSA", "ECDH", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0xC011: // ECDHE_RSA_WITH_RC4_128_SHA - return Ciphersuite(0xC011, "RSA", "ECDH", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0xC011, "RSA", "ECDH", "RC4", 16, 0, "SHA-1", 20); case 0xC017: // ECDH_anon_WITH_3DES_EDE_CBC_SHA return Ciphersuite(0xC017, "", "ECDH", "3DES", 24, 8, "SHA-1", 20); @@ -291,7 +291,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC019, "", "ECDH", "AES-256", 32, 16, "SHA-1", 20); case 0xC016: // ECDH_anon_WITH_RC4_128_SHA - return Ciphersuite(0xC016, "", "ECDH", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0xC016, "", "ECDH", "RC4", 16, 0, "SHA-1", 20); case 0x008B: // PSK_WITH_3DES_EDE_CBC_SHA return Ciphersuite(0x008B, "", "PSK", "3DES", 24, 8, "SHA-1", 20); @@ -327,7 +327,7 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC08F, "", "PSK", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0x008A: // PSK_WITH_RC4_128_SHA - return Ciphersuite(0x008A, "", "PSK", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0x008A, "", "PSK", "RC4", 16, 0, "SHA-1", 20); case 0x000A: // RSA_WITH_3DES_EDE_CBC_SHA return Ciphersuite(0x000A, "RSA", "RSA", "3DES", 24, 8, "SHA-1", 20); @@ -369,10 +369,10 @@ Ciphersuite Ciphersuite::by_id(u16bit suite) return Ciphersuite(0xC07B, "RSA", "RSA", "Camellia-256/GCM", 32, 4, "AEAD", 0, "SHA-384"); case 0x0004: // RSA_WITH_RC4_128_MD5 - return Ciphersuite(0x0004, "RSA", "RSA", "ARC4", 16, 0, "MD5", 16); + return Ciphersuite(0x0004, "RSA", "RSA", "RC4", 16, 0, "MD5", 16); case 0x0005: // RSA_WITH_RC4_128_SHA - return Ciphersuite(0x0005, "RSA", "RSA", "ARC4", 16, 0, "SHA-1", 20); + return Ciphersuite(0x0005, "RSA", "RSA", "RC4", 16, 0, "SHA-1", 20); case 0x0096: // RSA_WITH_SEED_CBC_SHA return Ciphersuite(0x0096, "RSA", "RSA", "SEED", 16, 16, "SHA-1", 20); -- cgit v1.2.3