Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 546328 | Differences between
and this patch

Collapse All | Expand All

(-)qca-ossl.cpp.orig (-43 lines)
Lines 5021-5064 Link Here
5021
			return QString("SSL3 to be added: %1").arg(cipherID & 0xffff, 0, 16);
5021
			return QString("SSL3 to be added: %1").arg(cipherID & 0xffff, 0, 16);
5022
			break;
5022
			break;
5023
		}
5023
		}
5024
	} else if (TLS::SSL_v2 == version) {
5025
		switch( cipherID & 0xffffff) {
5026
		case 0x010080:
5027
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5028
			return QString("SSL_CK_RC4_128_WITH_MD5");
5029
			break;
5030
		case 0x020080:
5031
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5032
			return QString("SSL_CK_RC4_128_EXPORT40_WITH_MD5");
5033
			break;
5034
		case 0x030080:
5035
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5036
			return QString("SSL_CK_RC2_128_CBC_WITH_MD5");
5037
			break;
5038
		case 0x040080:
5039
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5040
			return QString("SSL_CK_RC2_128_CBC_EXPORT40_WITH_MD5");
5041
			break;
5042
		case 0x050080:
5043
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5044
			return QString("SSL_CK_RC4_128_EXPORT40_WITH_MD5");
5045
			break;
5046
		case 0x060040:
5047
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5048
			return QString("SSL_CK_DES_64_CBC_WITH_MD5");
5049
			break;
5050
		case 0x0700C0:
5051
			// From the Netscape SSL2 Draft Section C.4 (nov 1994)
5052
			return QString("SSL_CK_DES_192_EDE3_CBC_WITH_MD5");
5053
			break;
5054
		case 0x080080:
5055
			// From the openssl source, which says "MS hack"
5056
			return QString("SSL_CK_RC4_64_WITH_MD5");
5057
			break;
5058
		default:
5059
			return QString("SSL2 to be added: %1").arg(cipherID & 0xffffff, 0, 16);
5060
			break;
5061
		}
5062
	}
5024
	}
5063
	else {
5025
	else {
5064
		return QString("Unknown version!");
5026
		return QString("Unknown version!");
Lines 5152-5160 Link Here
5152
		OpenSSL_add_ssl_algorithms();
5114
		OpenSSL_add_ssl_algorithms();
5153
		SSL_CTX *ctx = 0;
5115
		SSL_CTX *ctx = 0;
5154
		switch (version) {
5116
		switch (version) {
5155
		case TLS::SSL_v2:
5156
			ctx = SSL_CTX_new(SSLv2_client_method());
5157
			break;
5158
		case TLS::SSL_v3:
5117
		case TLS::SSL_v3:
5159
			ctx = SSL_CTX_new(SSLv3_client_method());
5118
			ctx = SSL_CTX_new(SSLv3_client_method());
5160
			break;
5119
			break;
Lines 5563-5570 Link Here
5563
			sessInfo.version = TLS::TLS_v1;
5522
			sessInfo.version = TLS::TLS_v1;
5564
		else if (ssl->version == SSL3_VERSION)
5523
		else if (ssl->version == SSL3_VERSION)
5565
			sessInfo.version = TLS::SSL_v3;
5524
			sessInfo.version = TLS::SSL_v3;
5566
		else if (ssl->version == SSL2_VERSION)
5567
			sessInfo.version = TLS::SSL_v2;
5568
		else {
5525
		else {
5569
			qDebug("unexpected version response");
5526
			qDebug("unexpected version response");
5570
			sessInfo.version = TLS::TLS_v1;
5527
			sessInfo.version = TLS::TLS_v1;

Return to bug 546328