Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:GA
libqca2.8225
disable-insecure-ssl.diff
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File disable-insecure-ssl.diff of Package libqca2.8225
--- CMakeLists.txt +++ CMakeLists.txt @@ -1,5 +1,12 @@ # QCA OSSL +INCLUDE(CheckFunctionExists) +SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) +CHECK_FUNCTION_EXISTS(EVP_md2 HAVE_OPENSSL_MD2) +IF (HAVE_OPENSSL_MD2) + ADD_DEFINITIONS(-DHAVE_OPENSSL_MD2) +ENDIF (HAVE_OPENSSL_MD2) + SET(QCA_OSSL_SOURCES qca-ossl.cpp) MY_AUTOMOC( QCA_OSSL_SOURCES ) @@ -9,9 +16,11 @@ TARGET_LINK_LIBRARIES(qca-ossl ${QT_QTCORE_LIBRARY}) TARGET_LINK_LIBRARIES(qca-ossl qca) TARGET_LINK_LIBRARIES(qca-ossl ${OPENSSL_LIBRARIES}) -if(APPLE) -TARGET_LINK_LIBRARIES(qca-ossl crypto) -endif(APPLE) + +IF (APPLE) + TARGET_LINK_LIBRARIES(qca-ossl crypto) +ENDIF (APPLE) + IF (WIN32) ADD_DEFINITIONS(-DOSSL_097) TARGET_LINK_LIBRARIES(qca-ossl gdi32) --- qca-ossl.cpp +++ qca-ossl.cpp @@ -1771,8 +1771,10 @@ md = EVP_sha1(); else if(alg == EMSA3_MD5) md = EVP_md5(); +#ifdef HAVE_OPENSSL_MD2 else if(alg == EMSA3_MD2) md = EVP_md2(); +#endif else if(alg == EMSA3_RIPEMD160) md = EVP_ripemd160(); else if(alg == EMSA3_Raw) @@ -1789,8 +1791,10 @@ md = EVP_sha1(); else if(alg == EMSA3_MD5) md = EVP_md5(); +#ifdef HAVE_OPENSSL_MD2 else if(alg == EMSA3_MD2) md = EVP_md2(); +#endif else if(alg == EMSA3_RIPEMD160) md = EVP_ripemd160(); else if(alg == EMSA3_Raw) @@ -3385,9 +3389,11 @@ case NID_md5WithRSAEncryption: p.sigalgo = QCA::EMSA3_MD5; break; +#ifdef HAVE_OPENSSL_MD2 case NID_md2WithRSAEncryption: p.sigalgo = QCA::EMSA3_MD2; break; +#endif case NID_ripemd160WithRSA: p.sigalgo = QCA::EMSA3_RIPEMD160; break; @@ -3871,9 +3877,11 @@ case NID_md5WithRSAEncryption: p.sigalgo = QCA::EMSA3_MD5; break; +#ifdef HAVE_OPENSSL_MD2 case NID_md2WithRSAEncryption: p.sigalgo = QCA::EMSA3_MD2; break; +#endif case NID_ripemd160WithRSA: p.sigalgo = QCA::EMSA3_RIPEMD160; break; @@ -4061,9 +4069,11 @@ case NID_md5WithRSAEncryption: p.sigalgo = QCA::EMSA3_MD5; break; +#ifdef HAVE_OPENSSL_MD2 case NID_md2WithRSAEncryption: p.sigalgo = QCA::EMSA3_MD2; break; +#endif case NID_ripemd160WithRSA: p.sigalgo = QCA::EMSA3_RIPEMD160; break; @@ -6582,7 +6592,9 @@ list += "sha1"; list += "sha0"; list += "ripemd160"; +#ifdef HAVE_OPENSSL_MD2 list += "md2"; +#endif list += "md4"; list += "md5"; #ifdef SHA224_DIGEST_LENGTH @@ -6597,9 +6609,11 @@ #ifdef SHA512_DIGEST_LENGTH list += "sha512"; #endif +/* #ifdef OBJ_whirlpool list += "whirlpool"; #endif +*/ return list; } @@ -6757,7 +6771,9 @@ list += all_hash_types(); list += all_mac_types(); list += all_cipher_types(); +#ifdef HAVE_OPENSSL_MD2 list += "pbkdf1(md2)"; +#endif list += "pbkdf1(sha1)"; list += "pbkdf2(sha1)"; list += "pkey"; @@ -6788,8 +6804,10 @@ return new opensslHashContext( EVP_sha(), this, type); else if ( type == "ripemd160" ) return new opensslHashContext( EVP_ripemd160(), this, type); +#ifdef HAVE_OPENSSL_MD2 else if ( type == "md2" ) return new opensslHashContext( EVP_md2(), this, type); +#endif else if ( type == "md4" ) return new opensslHashContext( EVP_md4(), this, type); else if ( type == "md5" ) @@ -6810,14 +6828,18 @@ else if ( type == "sha512" ) return new opensslHashContext( EVP_sha512(), this, type); #endif +/* #ifdef OBJ_whirlpool else if ( type == "whirlpool" ) return new opensslHashContext( EVP_whirlpool(), this, type); #endif +*/ else if ( type == "pbkdf1(sha1)" ) return new opensslPbkdf1Context( EVP_sha1(), this, type ); +#ifdef HAVE_OPENSSL_MD2 else if ( type == "pbkdf1(md2)" ) return new opensslPbkdf1Context( EVP_md2(), this, type ); +#endif else if ( type == "pbkdf2(sha1)" ) return new opensslPbkdf2Context( this, type ); else if ( type == "hmac(md5)" )
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
