Skip to content
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

Jump to bottom

Add pwdf retry logic to OpenSSHKeyV1KeyFile #587

Merged
merged 5 commits into from
May 28, 2020
Merged

Add pwdf retry logic to OpenSSHKeyV1KeyFile #587

merged 5 commits into from
May 28, 2020

Commits on May 27, 2020

  1. Add pwdf retry logic to OpenSSHKeyV1KeyFile 

    While PKCS8KeyFile uses PasswordFinder's shouldRetry to determine
whether it should call reqPassword again if decryption of they key file
fails, OpenSSHKeyV1KeyFile simply gives up and throws an exception.

With this commit, retry logic similar to that of PKCS8KeyFile is added
to OpenSSHKeyV1KeyFile. The PasswordFinder's reqPassword is called
again if the validation of the "checkint" fails, which indicates an
incorrect passphrase.
    @fmeum
    fmeum committed May 27, 2020
    Configuration menu
    Copy the full SHA
    18c2a91 View commit details
    Browse the repository at this point in the history

  2. Use new exception to signal incorrect passphrase

    @fmeum
    fmeum committed May 27, 2020
    Configuration menu
    Copy the full SHA
    b9a3fca View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into fhenneke_retry

    @hierynomus
    hierynomus committed May 27, 2020
    Configuration menu
    Copy the full SHA
    22d4f21 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Throw common exception on key decryption failure

    @fmeum
    fmeum committed May 28, 2020
    Configuration menu
    Copy the full SHA
    772a3fc View commit details
    Browse the repository at this point in the history

  2. Add test coverage for retry logic

    @fmeum
    fmeum committed May 28, 2020
    Configuration menu
    Copy the full SHA
    aba9dff View commit details
    Browse the repository at this point in the history