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

Collapse All | Expand All

(-)trunk/kdesupport/qca/plugins/qca-ossl/qca-ossl.cpp (+18 lines)
Lines 1782-1789 Link Here
1782
			md = EVP_sha1();
1782
			md = EVP_sha1();
1783
		else if(alg == EMSA3_MD5)
1783
		else if(alg == EMSA3_MD5)
1784
			md = EVP_md5();
1784
			md = EVP_md5();
1785
#ifdef HAVE_OPENSSL_MD2_H
1785
		else if(alg == EMSA3_MD2)
1786
		else if(alg == EMSA3_MD2)
1786
			md = EVP_md2();
1787
			md = EVP_md2();
1788
#endif
1787
		else if(alg == EMSA3_RIPEMD160)
1789
		else if(alg == EMSA3_RIPEMD160)
1788
			md = EVP_ripemd160();
1790
			md = EVP_ripemd160();
1789
		else if(alg == EMSA3_SHA224)
1791
		else if(alg == EMSA3_SHA224)
Lines 1808-1815 Link Here
1808
			md = EVP_sha1();
1810
			md = EVP_sha1();
1809
		else if(alg == EMSA3_MD5)
1811
		else if(alg == EMSA3_MD5)
1810
			md = EVP_md5();
1812
			md = EVP_md5();
1813
#ifdef HAVE_OPENSSL_MD2_H
1811
		else if(alg == EMSA3_MD2)
1814
		else if(alg == EMSA3_MD2)
1812
			md = EVP_md2();
1815
			md = EVP_md2();
1816
#endif
1813
		else if(alg == EMSA3_RIPEMD160)
1817
		else if(alg == EMSA3_RIPEMD160)
1814
			md = EVP_ripemd160();
1818
			md = EVP_ripemd160();
1815
		else if(alg == EMSA3_SHA224)
1819
		else if(alg == EMSA3_SHA224)
Lines 3412-3420 Link Here
3412
		case NID_md5WithRSAEncryption:
3416
		case NID_md5WithRSAEncryption:
3413
		    p.sigalgo = QCA::EMSA3_MD5;
3417
		    p.sigalgo = QCA::EMSA3_MD5;
3414
		    break;
3418
		    break;
3419
#ifdef HAVE_OPENSSL_MD2_H
3415
		case NID_md2WithRSAEncryption:
3420
		case NID_md2WithRSAEncryption:
3416
		    p.sigalgo = QCA::EMSA3_MD2;
3421
		    p.sigalgo = QCA::EMSA3_MD2;
3417
		    break;
3422
		    break;
3423
#endif
3418
		case NID_ripemd160WithRSA:
3424
		case NID_ripemd160WithRSA:
3419
		    p.sigalgo = QCA::EMSA3_RIPEMD160;
3425
		    p.sigalgo = QCA::EMSA3_RIPEMD160;
3420
		    break;
3426
		    break;
Lines 3910-3918 Link Here
3910
		case NID_md5WithRSAEncryption:
3916
		case NID_md5WithRSAEncryption:
3911
		    p.sigalgo = QCA::EMSA3_MD5;
3917
		    p.sigalgo = QCA::EMSA3_MD5;
3912
		    break;
3918
		    break;
3919
#ifdef HAVE_OPENSSL_MD2_H
3913
		case NID_md2WithRSAEncryption:
3920
		case NID_md2WithRSAEncryption:
3914
		    p.sigalgo = QCA::EMSA3_MD2;
3921
		    p.sigalgo = QCA::EMSA3_MD2;
3915
		    break;
3922
		    break;
3923
#endif
3916
		case NID_ripemd160WithRSA:
3924
		case NID_ripemd160WithRSA:
3917
		    p.sigalgo = QCA::EMSA3_RIPEMD160;
3925
		    p.sigalgo = QCA::EMSA3_RIPEMD160;
3918
		    break;
3926
		    break;
Lines 4100-4108 Link Here
4100
		case NID_md5WithRSAEncryption:
4108
		case NID_md5WithRSAEncryption:
4101
		    p.sigalgo = QCA::EMSA3_MD5;
4109
		    p.sigalgo = QCA::EMSA3_MD5;
4102
		    break;
4110
		    break;
4111
#ifdef HAVE_OPENSSL_MD2_H
4103
		case NID_md2WithRSAEncryption:
4112
		case NID_md2WithRSAEncryption:
4104
		    p.sigalgo = QCA::EMSA3_MD2;
4113
		    p.sigalgo = QCA::EMSA3_MD2;
4105
		    break;
4114
		    break;
4115
#endif
4106
		case NID_ripemd160WithRSA:
4116
		case NID_ripemd160WithRSA:
4107
		    p.sigalgo = QCA::EMSA3_RIPEMD160;
4117
		    p.sigalgo = QCA::EMSA3_RIPEMD160;
4108
		    break;
4118
		    break;
Lines 6640-6646 Link Here
6640
	list += "sha1";
6650
	list += "sha1";
6641
	list += "sha0";
6651
	list += "sha0";
6642
	list += "ripemd160";
6652
	list += "ripemd160";
6653
#ifdef HAVE_OPENSSL_MD2_H
6643
	list += "md2";
6654
	list += "md2";
6655
#endif
6644
	list += "md4";
6656
	list += "md4";
6645
	list += "md5";
6657
	list += "md5";
6646
#ifdef SHA224_DIGEST_LENGTH
6658
#ifdef SHA224_DIGEST_LENGTH
Lines 6849-6855 Link Here
6849
		list += all_hash_types();
6861
		list += all_hash_types();
6850
		list += all_mac_types();
6862
		list += all_mac_types();
6851
		list += all_cipher_types();
6863
		list += all_cipher_types();
6864
#ifdef HAVE_OPENSSL_MD2_H
6852
		list += "pbkdf1(md2)";
6865
		list += "pbkdf1(md2)";
6866
#endif
6853
		list += "pbkdf1(sha1)";
6867
		list += "pbkdf1(sha1)";
6854
		list += "pbkdf2(sha1)";
6868
		list += "pbkdf2(sha1)";
6855
		list += "pkey";
6869
		list += "pkey";
Lines 6882-6889 Link Here
6882
			return new opensslHashContext( EVP_sha(), this, type);
6896
			return new opensslHashContext( EVP_sha(), this, type);
6883
		else if ( type == "ripemd160" )
6897
		else if ( type == "ripemd160" )
6884
			return new opensslHashContext( EVP_ripemd160(), this, type);
6898
			return new opensslHashContext( EVP_ripemd160(), this, type);
6899
#ifdef HAVE_OPENSSL_MD2_H
6885
		else if ( type == "md2" )
6900
		else if ( type == "md2" )
6886
			return new opensslHashContext( EVP_md2(), this, type);
6901
			return new opensslHashContext( EVP_md2(), this, type);
6902
#endif
6887
		else if ( type == "md4" )
6903
		else if ( type == "md4" )
6888
			return new opensslHashContext( EVP_md4(), this, type);
6904
			return new opensslHashContext( EVP_md4(), this, type);
6889
		else if ( type == "md5" )
6905
		else if ( type == "md5" )
Lines 6912-6919 Link Here
6912
*/
6928
*/
6913
		else if ( type == "pbkdf1(sha1)" )
6929
		else if ( type == "pbkdf1(sha1)" )
6914
			return new opensslPbkdf1Context( EVP_sha1(), this, type );
6930
			return new opensslPbkdf1Context( EVP_sha1(), this, type );
6931
#ifdef HAVE_OPENSSL_MD2_H
6915
		else if ( type == "pbkdf1(md2)" )
6932
		else if ( type == "pbkdf1(md2)" )
6916
			return new opensslPbkdf1Context( EVP_md2(), this, type );
6933
			return new opensslPbkdf1Context( EVP_md2(), this, type );
6934
#endif
6917
		else if ( type == "pbkdf2(sha1)" )
6935
		else if ( type == "pbkdf2(sha1)" )
6918
			return new opensslPbkdf2Context( this, type );
6936
			return new opensslPbkdf2Context( this, type );
6919
		else if ( type == "hmac(md5)" )
6937
		else if ( type == "hmac(md5)" )

Return to bug 313571