generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-11-13 20:37:30 +01:00
Code Issues Projects Releases Wiki Activity

fixed GH #510: Incorrect RSAKey construction from istream

Browse Source
This commit is contained in:
Guenter Obiltschnig
2014-08-01 09:57:41 +02:00
parent 9258e482d7
commit 52ba87a6f0
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Crypto/src/RSAKeyImpl.cpp
View File

@@ -86,7 +86,9 @@ RSAKeyImpl::RSAKeyImpl(
RSA* pubKey = PEM_read_bio_RSAPublicKey(bio, &_pRSA, 0, 0); RSA* pubKey = PEM_read_bio_RSAPublicKey(bio, &_pRSA, 0, 0);
if (!pubKey) if (!pubKey)
{ {
int rc = BIO_seek(bio, 0); int rc = BIO_reset(bio);
// BIO_reset() normally returns 1 for success and 0 or -1 for failure.
// File BIOs are an exception, they return 0 for success and -1 for failure.
if (rc != 0) throw Poco::FileException("Failed to load public key", publicKeyFile); if (rc != 0) throw Poco::FileException("Failed to load public key", publicKeyFile);
pubKey = PEM_read_bio_RSA_PUBKEY(bio, &_pRSA, 0, 0); pubKey = PEM_read_bio_RSA_PUBKEY(bio, &_pRSA, 0, 0);
} }
@@ -147,8 +149,10 @@ RSAKeyImpl::RSAKeyImpl(std::istream* pPublicKeyStream, std::istream* pPrivateKey
RSA* publicKey = PEM_read_bio_RSAPublicKey(bio, &_pRSA, 0, 0); RSA* publicKey = PEM_read_bio_RSAPublicKey(bio, &_pRSA, 0, 0);
if (!publicKey) if (!publicKey)
{ {
int rc = BIO_seek(bio, 0); int rc = BIO_reset(bio);
if (rc != 0) throw Poco::FileException("Failed to load public key"); // BIO_reset() normally returns 1 for success and 0 or -1 for failure.
// File BIOs are an exception, they return 0 for success and -1 for failure.
if (rc != 1) throw Poco::FileException("Failed to load public key");
publicKey = PEM_read_bio_RSA_PUBKEY(bio, &_pRSA, 0, 0); publicKey = PEM_read_bio_RSA_PUBKEY(bio, &_pRSA, 0, 0);
} }
BIO_free(bio); BIO_free(bio);