|
Lines 40-47
Link Here
|
| 40 |
#include <openssl/x509v3.h> |
40 |
#include <openssl/x509v3.h> |
| 41 |
#include <openssl/pkcs12.h> |
41 |
#include <openssl/pkcs12.h> |
| 42 |
#include <openssl/ssl.h> |
42 |
#include <openssl/ssl.h> |
| 43 |
|
43 |
#if !defined(LIBRESSL_VERSION_NUMBER) |
| 44 |
#include <openssl/kdf.h> |
44 |
#include <openssl/kdf.h> |
|
|
45 |
#endif |
| 45 |
|
46 |
|
| 46 |
using namespace QCA; |
47 |
using namespace QCA; |
| 47 |
|
48 |
|
|
Lines 1255-1260
public:
Link Here
|
| 1255 |
protected: |
1256 |
protected: |
| 1256 |
}; |
1257 |
}; |
| 1257 |
|
1258 |
|
|
|
1259 |
#if !defined(LIBRESSL_VERSION_NUMBER) |
| 1258 |
class opensslHkdfContext : public HKDFContext |
1260 |
class opensslHkdfContext : public HKDFContext |
| 1259 |
{ |
1261 |
{ |
| 1260 |
Q_OBJECT |
1262 |
Q_OBJECT |
|
Lines 1284-1289
public:
Link Here
|
| 1284 |
return out; |
1286 |
return out; |
| 1285 |
} |
1287 |
} |
| 1286 |
}; |
1288 |
}; |
|
|
1289 |
#endif |
| 1287 |
|
1290 |
|
| 1288 |
class opensslHMACContext : public MACContext |
1291 |
class opensslHMACContext : public MACContext |
| 1289 |
{ |
1292 |
{ |
|
Lines 2823-2829
public:
Link Here
|
| 2823 |
} |
2826 |
} |
| 2824 |
else |
2827 |
else |
| 2825 |
{ |
2828 |
{ |
| 2826 |
RSAerr(RSA_F_RSA_OSSL_PRIVATE_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); |
2829 |
RSAerr(RSA_F_RSA_EAY_PRIVATE_DECRYPT, RSA_R_UNKNOWN_PADDING_TYPE); |
| 2827 |
return -1; |
2830 |
return -1; |
| 2828 |
} |
2831 |
} |
| 2829 |
|
2832 |
|
|
Lines 7268-7274
public:
Link Here
|
| 7268 |
#endif |
7271 |
#endif |
| 7269 |
list += QStringLiteral("pbkdf1(sha1)"); |
7272 |
list += QStringLiteral("pbkdf1(sha1)"); |
| 7270 |
list += QStringLiteral("pbkdf2(sha1)"); |
7273 |
list += QStringLiteral("pbkdf2(sha1)"); |
|
|
7274 |
#if !defined(LIBRESSL_VERSION_NUMBER) |
| 7271 |
list += QStringLiteral("hkdf(sha256)"); |
7275 |
list += QStringLiteral("hkdf(sha256)"); |
|
|
7276 |
#endif |
| 7272 |
list += QStringLiteral("pkey"); |
7277 |
list += QStringLiteral("pkey"); |
| 7273 |
list += QStringLiteral("dlgroup"); |
7278 |
list += QStringLiteral("dlgroup"); |
| 7274 |
list += QStringLiteral("rsa"); |
7279 |
list += QStringLiteral("rsa"); |
|
Lines 7337-7344
public:
Link Here
|
| 7337 |
#endif |
7342 |
#endif |
| 7338 |
else if ( type == QLatin1String("pbkdf2(sha1)") ) |
7343 |
else if ( type == QLatin1String("pbkdf2(sha1)") ) |
| 7339 |
return new opensslPbkdf2Context( this, type ); |
7344 |
return new opensslPbkdf2Context( this, type ); |
|
|
7345 |
#if !defined(LIBRESSL_VERSION_NUMBER) |
| 7340 |
else if ( type == QLatin1String("hkdf(sha256)") ) |
7346 |
else if ( type == QLatin1String("hkdf(sha256)") ) |
| 7341 |
return new opensslHkdfContext( this, type ); |
7347 |
return new opensslHkdfContext( this, type ); |
|
|
7348 |
#endif |
| 7342 |
else if ( type == QLatin1String("hmac(md5)") ) |
7349 |
else if ( type == QLatin1String("hmac(md5)") ) |
| 7343 |
return new opensslHMACContext( EVP_md5(), this, type ); |
7350 |
return new opensslHMACContext( EVP_md5(), this, type ); |
| 7344 |
else if ( type == QLatin1String("hmac(sha1)") ) |
7351 |
else if ( type == QLatin1String("hmac(sha1)") ) |
