Skip to content

Attempting to load a passphrase-protected key should not prompt cin #4799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nyashbox wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −2
Open

Attempting to load a passphrase-protected key should not prompt cin #4799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
758310f
fix(Crypto): remove password prompting when using empty password in a…
nyashbox Dec 2, 2024
45d387d
test(Crypto): add empty password test for EVPPKey constructor
nyashbox Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Crypto/include/Poco/Crypto/EVPPKey.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ class Crypto_API EVPPKey
if (pFile)
{
pem_password_cb* pCB = pass.empty() ? (pem_password_cb*)0 : &passCB;
void* pPassword = pass.empty() ? (void*)0 : (void*)pass.c_str();
void* pPassword = (void*)pass.c_str();
if (readFunc(pFile, &pKey, pCB, pPassword))
{
fclose(pFile); pFile = 0;
Expand Down Expand Up @@ -302,7 +302,7 @@ class Crypto_API EVPPKey
if (pKey)
{
pem_password_cb* pCB = pass.empty() ? (pem_password_cb*)0 : &passCB;
void* pPassword = pass.empty() ? (void*)0 : (void*)pass.c_str();
void* pPassword = (void*)pass.c_str();
if (readFunc(pBIO, &pKey, pCB, pPassword))
{
BIO_free(pBIO); pBIO = 0;
Expand Down
9 changes: 9 additions & 0 deletions Crypto/testsuite/src/EVPTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,6 +518,15 @@ void EVPTest::testECEVPSaveLoadFile()
key3.save(&strPub3);
std::string pubFromPrivate = strPub3.str();
assertTrue (pubFromPrivate == pubKey);

// Create new key with empty password
EVPPKey key4(curveName);

key4.save(filePub.path(), filePriv.path(), "");

// Load key from file with empty password.
// No input string should be prompted
EVPPKey key4LoadEmptyPass { "", filePriv.path(), "" };
}
else
std::cerr << "No elliptic curves found!" << std::endl;
Expand Down
Loading