fix(Crypto): Prevent stdin password prompt when loading protected key (#4627)#5128
Merged
fix(Crypto): Prevent stdin password prompt when loading protected key (#4627)#5128
Conversation
…#4627) Co-Authored-By: nyashbox <nyashbox@tutanota.com>
9213fae to
051cc84
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #4627 - When loading a passphrase-protected private key with EVPPKey using an empty password, OpenSSL would prompt stdin for the password. This is unsuitable for library code.
Supersedes #4799 with a more complete fix that works on both macOS and Linux.
Root Cause
The original code set both the password callback (
pCB) and password data (pPassword) to NULL when password was empty:On Linux, when the callback is NULL, OpenSSL ignores
pPasswordentirely and falls back to prompting stdin.Fix
Always provide the callback, even when password is empty:
The
passCBfunction already handles empty passwords correctly - it returns 0 when password length is 0, which tells OpenSSL "no password provided" and causes a proper error instead of stdin prompt.Changes
EVPPKey.h: Always use password callback in both file-based and stream-based key loadingtestECEVPLoadKeyWrongPasswordto verify empty/wrong password throws exception