Menu
▾
▴
dcplusplus-commit
Update of /cvsroot/dcplusplus/dcplusplus/yassl/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25210/yassl/src Modified Files: buffer.cpp yassl_imp.cpp handshake.cpp ssl.cpp socket_wrapper.cpp cert_wrapper.cpp crypto_wrapper.cpp yassl_int.cpp Log Message: yassl update, installer fix Index: cert_wrapper.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/cert_wrapper.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cert_wrapper.cpp 27 Nov 2005 19:23:07 -0000 1.1 --- cert_wrapper.cpp 19 Feb 2006 16:51:08 -0000 1.2 *************** *** 40,44 **** ! x509::x509(uint sz) : length_(sz), buffer_(new opaque[sz]) { } --- 40,44 ---- ! x509::x509(uint sz) : length_(sz), buffer_(NEW_YS opaque[sz]) { } *************** *** 52,56 **** x509::x509(const x509& that) : length_(that.length_), ! buffer_(new opaque[length_]) { memcpy(buffer_, that.buffer_, length_); --- 52,56 ---- x509::x509(const x509& that) : length_(that.length_), ! buffer_(NEW_YS opaque[length_]) { memcpy(buffer_, that.buffer_, length_); *************** *** 93,97 **** //CertManager CertManager::CertManager() ! : peerX509_(0), verifyPeer_(false), failNoCert_(false), sendVerify_(false) {} --- 93,98 ---- //CertManager CertManager::CertManager() ! : peerX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false), ! sendVerify_(false) {} *************** *** 115,118 **** --- 116,125 ---- + bool CertManager::verifyNone() const + { + return verifyNone_; + } + + bool CertManager::failNoCert() const { *************** *** 133,136 **** --- 140,149 ---- + void CertManager::setVerifyNone() + { + verifyNone_ = true; + } + + void CertManager::setFailNoCert() { *************** *** 154,158 **** { if (x) ! list_.push_back(new x509(*x)); } --- 167,171 ---- { if (x) ! list_.push_back(NEW_YS x509(*x)); } *************** *** 162,171 **** { TaoCrypt::Source source(x->get_buffer(), x->get_length()); ! TaoCrypt::CertDecoder cert(source, true, &signers_, TaoCrypt::CertDecoder::CA); if (!cert.GetError().What()) { const TaoCrypt::PublicKey& key = cert.GetPublicKey(); ! signers_.push_back(new TaoCrypt::Signer(key.GetKey(), key.size(), cert.GetCommonName(), cert.GetHash())); } --- 175,184 ---- { TaoCrypt::Source source(x->get_buffer(), x->get_length()); ! TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_, TaoCrypt::CertDecoder::CA); if (!cert.GetError().What()) { const TaoCrypt::PublicKey& key = cert.GetPublicKey(); ! signers_.push_back(NEW_YS TaoCrypt::Signer(key.GetKey(), key.size(), cert.GetCommonName(), cert.GetHash())); } *************** *** 230,234 **** while ( count > 1 ) { TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length()); ! TaoCrypt::CertDecoder cert(source, true, &signers_); if (int err = cert.GetError().What()) --- 243,247 ---- while ( count > 1 ) { TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length()); ! TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_); if (int err = cert.GetError().What()) *************** *** 236,240 **** const TaoCrypt::PublicKey& key = cert.GetPublicKey(); ! signers_.push_back(new TaoCrypt::Signer(key.GetKey(), key.size(), cert.GetCommonName(), cert.GetHash())); --last; --- 249,253 ---- const TaoCrypt::PublicKey& key = cert.GetPublicKey(); ! signers_.push_back(NEW_YS TaoCrypt::Signer(key.GetKey(), key.size(), cert.GetCommonName(), cert.GetHash())); --last; *************** *** 245,249 **** // peer's is at the front TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length()); ! TaoCrypt::CertDecoder cert(source, true, &signers_); if (int err = cert.GetError().What()) --- 258,262 ---- // peer's is at the front TaoCrypt::Source source((*last)->get_buffer(), (*last)->get_length()); ! TaoCrypt::CertDecoder cert(source, true, &signers_, verifyNone_); if (int err = cert.GetError().What()) *************** *** 261,265 **** int iSz = cert.GetIssuer() ? strlen(cert.GetIssuer()) + 1 : 0; int sSz = cert.GetCommonName() ? strlen(cert.GetCommonName()) + 1 : 0; ! peerX509_ = new X509(cert.GetIssuer(), iSz, cert.GetCommonName(), sSz); } --- 274,278 ---- int iSz = cert.GetIssuer() ? strlen(cert.GetIssuer()) + 1 : 0; int sSz = cert.GetCommonName() ? strlen(cert.GetCommonName()) + 1 : 0; ! peerX509_ = NEW_YS X509(cert.GetIssuer(), iSz, cert.GetCommonName(), sSz); } Index: ssl.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/ssl.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ssl.cpp 27 Nov 2005 19:23:07 -0000 1.1 --- ssl.cpp 19 Feb 2006 16:51:08 -0000 1.2 *************** *** 30,34 **** - /* see man pages for function descriptions */ --- 30,33 ---- *************** *** 39,42 **** --- 38,49 ---- #include <stdio.h> + #ifdef _WIN32 + #include <windows.h> // FindFirstFile etc.. + #else + #include <sys/types.h> // file helper + #include <sys/stat.h> // stat + #include <dirent.h> // opendir + #endif + namespace yaSSL { *************** *** 53,57 **** SSL_METHOD* SSLv3_server_method() { ! return new SSL_METHOD(server_end, ProtocolVersion(3,0)); } --- 60,64 ---- SSL_METHOD* SSLv3_server_method() { ! return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,0)); } *************** *** 59,63 **** SSL_METHOD* SSLv3_client_method() { ! return new SSL_METHOD(client_end, ProtocolVersion(3,0)); } --- 66,70 ---- SSL_METHOD* SSLv3_client_method() { ! return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,0)); } *************** *** 65,69 **** SSL_METHOD* TLSv1_server_method() { ! return new SSL_METHOD(server_end, ProtocolVersion(3,1)); } --- 72,76 ---- SSL_METHOD* TLSv1_server_method() { ! return NEW_YS SSL_METHOD(server_end, ProtocolVersion(3,1)); } *************** *** 71,75 **** SSL_METHOD* TLSv1_client_method() { ! return new SSL_METHOD(client_end, ProtocolVersion(3,1)); } --- 78,82 ---- SSL_METHOD* TLSv1_client_method() { ! return NEW_YS SSL_METHOD(client_end, ProtocolVersion(3,1)); } *************** *** 84,88 **** SSL_CTX* SSL_CTX_new(SSL_METHOD* method) { ! return new SSL_CTX(method); } --- 91,95 ---- SSL_CTX* SSL_CTX_new(SSL_METHOD* method) { ! return NEW_YS SSL_CTX(method); } *************** *** 96,100 **** SSL* SSL_new(SSL_CTX* ctx) { ! return new SSL(ctx); } --- 103,107 ---- SSL* SSL_new(SSL_CTX* ctx) { ! return NEW_YS SSL(ctx); } *************** *** 459,463 **** long sz = ftell(input); rewind(input); ! x = new x509(sz); // takes ownership size_t bytes = fread(x->use_buffer(), sz, 1, input); if (bytes != 1) { --- 466,470 ---- long sz = ftell(input); rewind(input); ! x = NEW_YS x509(sz); // takes ownership size_t bytes = fread(x->use_buffer(), sz, 1, input); if (bytes != 1) { *************** *** 496,499 **** --- 503,509 ---- ctx->setVerifyPeer(); + if (mode == SSL_VERIFY_NONE) + ctx->setVerifyNone(); + if (mode & SSL_VERIFY_FAIL_IF_NO_PEER_CERT) ctx->setFailNoCert(); *************** *** 502,509 **** int SSL_CTX_load_verify_locations(SSL_CTX* ctx, const char* file, ! const char* /*path*/) { ! // just files for now ! return read_file(ctx, file, SSL_FILETYPE_PEM, CA); } --- 512,574 ---- int SSL_CTX_load_verify_locations(SSL_CTX* ctx, const char* file, ! const char* path) { ! int ret = SSL_SUCCESS; ! const int HALF_PATH = 128; ! ! if (file) ret = read_file(ctx, file, SSL_FILETYPE_PEM, CA); ! ! if (ret == SSL_SUCCESS && path) { ! // call read_file for each reqular file in path ! #ifdef _WIN32 ! ! WIN32_FIND_DATA FindFileData; ! HANDLE hFind; ! ! char name[MAX_PATH + 1]; // directory specification ! strncpy(name, path, MAX_PATH - 3); ! strncat(name, "\\*", 3); ! ! hFind = FindFirstFile(name, &FindFileData); ! if (hFind == INVALID_HANDLE_VALUE) return SSL_BAD_PATH; ! ! do { ! if (FindFileData.dwFileAttributes != FILE_ATTRIBUTE_DIRECTORY) { ! strncpy(name, path, MAX_PATH - 2 - HALF_PATH); ! strncat(name, "\\", 2); ! strncat(name, FindFileData.cFileName, HALF_PATH); ! ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA); ! } ! } while (ret == SSL_SUCCESS && FindNextFile(hFind, &FindFileData)); ! ! FindClose(hFind); ! ! #else // _WIN32 ! ! const int MAX_PATH = 260; ! ! DIR* dir = opendir(path); ! if (!dir) return SSL_BAD_PATH; ! ! struct dirent* entry; ! struct stat buf; ! char name[MAX_PATH + 1]; ! ! while (ret == SSL_SUCCESS && (entry = readdir(dir))) { ! strncpy(name, path, MAX_PATH - 1 - HALF_PATH); ! strncat(name, "/", 1); ! strncat(name, entry->d_name, HALF_PATH); ! if (stat(name, &buf) < 0) return SSL_BAD_STAT; ! ! if (S_ISREG(buf.st_mode)) ! ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA); ! } ! ! closedir(dir); ! ! #endif ! } ! ! return ret; } *************** *** 654,658 **** DH* DH_new(void) { ! DH* dh = new DH; if (dh) dh->p = dh->g = 0; --- 719,723 ---- DH* DH_new(void) { ! DH* dh = NEW_YS DH; if (dh) dh->p = dh->g = 0; *************** *** 679,683 **** if (!retVal) { created = true; ! bn.reset(new BIGNUM); retVal = bn.get(); } --- 744,748 ---- if (!retVal) { created = true; ! bn.reset(NEW_YS BIGNUM); retVal = bn.get(); } *************** *** 730,734 **** { // TODO: FIX add to some list for destruction ! return new MD5; } --- 795,799 ---- { // TODO: FIX add to some list for destruction ! return NEW_YS MD5; } *************** *** 737,741 **** { // TODO: FIX add to some list for destruction ! return new DES_EDE; } --- 802,806 ---- { // TODO: FIX add to some list for destruction ! return NEW_YS DES_EDE; } Index: buffer.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/buffer.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** buffer.cpp 27 Nov 2005 19:23:07 -0000 1.1 --- buffer.cpp 19 Feb 2006 16:51:08 -0000 1.2 *************** *** 65,69 **** input_buffer::input_buffer(uint s) ! : size_(0), current_(0), buffer_(new byte[s]), end_(buffer_ + s) {} --- 65,69 ---- input_buffer::input_buffer(uint s) ! : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) {} *************** *** 71,75 **** // with assign input_buffer::input_buffer(uint s, const byte* t, uint len) ! : size_(0), current_(0), buffer_(new byte[s]), end_(buffer_ + s) { assign(t, len); --- 71,75 ---- // with assign input_buffer::input_buffer(uint s, const byte* t, uint len) ! : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) { assign(t, len); *************** *** 87,91 **** { assert(!buffer_); // find realloc error ! buffer_ = new byte[s]; end_ = buffer_ + s; } --- 87,91 ---- { assert(!buffer_); // find realloc error ! buffer_ = NEW_YS byte[s]; end_ = buffer_ + s; } *************** *** 99,103 **** ! // after a raw write user can set new size // if you know the size before the write use assign() void input_buffer::add_size(uint i) --- 99,103 ---- ! // after a raw write user can set NEW_YS size // if you know the size before the write use assign() void input_buffer::add_size(uint i) *************** *** 201,205 **** // with allocate output_buffer::output_buffer(uint s) ! : current_(0), buffer_(new byte[s]), end_(buffer_ + s) {} --- 201,205 ---- // with allocate output_buffer::output_buffer(uint s) ! : current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) {} *************** *** 207,211 **** // with assign output_buffer::output_buffer(uint s, const byte* t, uint len) ! : current_(0), buffer_(new byte[s]), end_(buffer_+ s) { write(t, len); --- 207,211 ---- // with assign output_buffer::output_buffer(uint s, const byte* t, uint len) ! : current_(0), buffer_(NEW_YS byte[s]), end_(buffer_+ s) { write(t, len); *************** *** 242,246 **** { assert(!buffer_); // find realloc error ! buffer_ = new byte[s]; end_ = buffer_ + s; } --- 242,246 ---- { assert(!buffer_); // find realloc error ! buffer_ = NEW_YS byte[s]; end_ = buffer_ + s; } Index: yassl_int.cpp =================================================================== RCS file: /cvsroot/dcplusplus/dcplusplus/yassl/src/yassl_int.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** yassl_int.cpp 27 Nov 2005 19:23:08 -0000 1.1 --- yassl_int.cpp 19 Feb 2006 16:51:08 -0000 1.2 *************** *** 32,69 **** - void* operator new(size_t sz, yaSSL::new_t) - { #ifdef YASSL_PURE_C - void* ptr = malloc(sz ? sz : 1); - if (!ptr) abort(); ! return ptr; ! #else ! return ::operator new(sz); ! #endif ! } - void operator delete(void* ptr, yaSSL::new_t) - { - #ifdef YASSL_PURE_C - if (ptr) free(ptr); - #else - ::operator delete(ptr); - #endif - } - void* operator new[](size_t sz, yaSSL::new_t nt) - { - return ::operator new(sz, nt); - } - void operator delete[](void* ptr, yaSSL::new_t nt) - { - ::operator delete(ptr, nt); - } --- 32,70 ---- #ifdef YASSL_PURE_C ! void* operator new(size_t sz, yaSSL::new_t) ! { ! void* ptr = malloc(sz ? sz : 1); ! if (!ptr) abort(); + return ptr; + } + void operator delete(void* ptr, yaSSL::new_t) + { + if (ptr) free(ptr); + } + void* operator new[](size_t sz, yaSSL::new_t nt) + { + return ::operator new(sz, nt); + } + void operator delete[](void* ptr, yaSSL::new_t nt) + { + ::operator delete(ptr, nt); + } + + namespace yaSSL { + + new_t ys; // for yaSSL library new + + } + + #endif // YASSL_PURE_C *************** *** 73,77 **** using mySTL::min; - new_t ys; // for yaSSL library new --- 74,77 ---- *************** *** 287,290 **** --- 287,292 ---- if (ctx->getMethod()->verifyPeer()) cm.setVerifyPeer(); + if (ctx->getMethod()->verifyNone()) + cm.setVerifyNone(); if (ctx->getMethod()->failNoCert()) cm.setFailNoCert(); *************** *** 322,327 **** parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME); --- 324,329 ---- parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME); *************** *** 336,341 **** parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new AES); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME); --- 338,343 ---- parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS AES); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME); *************** *** 350,355 **** parms.iv_size_ = DES_IV_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new DES_EDE); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_3DES_EDE_CBC_SHA] , MAX_SUITE_NAME); --- 352,357 ---- parms.iv_size_ = DES_IV_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS DES_EDE); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_3DES_EDE_CBC_SHA] , MAX_SUITE_NAME); *************** *** 364,369 **** parms.iv_size_ = DES_IV_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new DES); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_DES_CBC_SHA], MAX_SUITE_NAME); --- 366,371 ---- parms.iv_size_ = DES_IV_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS DES); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_DES_CBC_SHA], MAX_SUITE_NAME); *************** *** 378,383 **** parms.iv_size_ = 0; parms.cipher_type_ = stream; ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new RC4); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_SHA], MAX_SUITE_NAME); --- 380,385 ---- parms.iv_size_ = 0; parms.cipher_type_ = stream; ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS RC4); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_SHA], MAX_SUITE_NAME); *************** *** 392,397 **** parms.iv_size_ = 0; parms.cipher_type_ = stream; ! crypto_.setDigest(new MD5); ! crypto_.setCipher(new RC4); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_MD5], MAX_SUITE_NAME); --- 394,399 ---- parms.iv_size_ = 0; parms.cipher_type_ = stream; ! crypto_.setDigest(NEW_YS MD5); ! crypto_.setCipher(NEW_YS RC4); strncpy(parms.cipher_name_, cipher_names[SSL_RSA_WITH_RC4_128_MD5], MAX_SUITE_NAME); *************** *** 408,413 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new DES); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_DES_CBC_SHA], MAX_SUITE_NAME); --- 410,415 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS DES); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_DES_CBC_SHA], MAX_SUITE_NAME); *************** *** 424,429 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new DES_EDE); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME); --- 426,431 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS DES_EDE); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME); *************** *** 440,445 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME); --- 442,447 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME); *************** *** 456,461 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME); --- 458,463 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME); *************** *** 472,477 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new DES); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_DES_CBC_SHA], MAX_SUITE_NAME); --- 474,479 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS DES); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_DES_CBC_SHA], MAX_SUITE_NAME); *************** *** 488,493 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new DES_EDE); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME); --- 490,495 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS DES_EDE); strncpy(parms.cipher_name_, cipher_names[SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA], MAX_SUITE_NAME); *************** *** 504,509 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME); --- 506,511 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_SHA], MAX_SUITE_NAME); *************** *** 520,525 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new SHA); ! crypto_.setCipher(new AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME); --- 522,527 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS SHA); ! crypto_.setCipher(NEW_YS AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_SHA], MAX_SUITE_NAME); *************** *** 534,539 **** parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_RMD160], MAX_SUITE_NAME); --- 536,541 ---- parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_256_CBC_RMD160], MAX_SUITE_NAME); *************** *** 548,553 **** parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new AES); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_RMD160], MAX_SUITE_NAME); --- 550,555 ---- parms.iv_size_ = AES_BLOCK_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS AES); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_AES_128_CBC_RMD160], MAX_SUITE_NAME); *************** *** 562,567 **** parms.iv_size_ = DES_IV_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new DES_EDE); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_3DES_EDE_CBC_RMD160], MAX_SUITE_NAME); --- 564,569 ---- parms.iv_size_ = DES_IV_SZ; parms.cipher_type_ = block; ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS DES_EDE); strncpy(parms.cipher_name_, cipher_names[TLS_RSA_WITH_3DES_EDE_CBC_RMD160], MAX_SUITE_NAME); *************** *** 578,583 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new DES_EDE); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160], --- 580,585 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS DES_EDE); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_3DES_EDE_CBC_RMD160], *************** *** 595,600 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_RMD160], --- 597,602 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_256_CBC_RMD160], *************** *** 612,617 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_RMD160], --- 614,619 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_RSA_WITH_AES_128_CBC_RMD160], *************** *** 629,634 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new DES_EDE); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160], --- 631,636 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS DES_EDE); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_3DES_EDE_CBC_RMD160], *************** *** 646,651 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_RMD160], --- 648,653 ---- parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(NEW_YS RMD); ! crypto_.setCipher(NEW_YS AES(AES_256_KEY_SZ)); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_256_CBC_RMD160], *************** *** 663,668 **** parms.cipher_type_ = block; secure_.use_connection().send_server_key_ = true; // eph ! crypto_.setDigest(new RMD); ! crypto_.setCipher(new AES); strncpy(parms.cipher_name_, cipher_names[TLS_DHE_DSS_WITH_AES_128_CBC_RMD160], -... [truncated message content] |
