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

Minor modifications to PKCS5KeyFile #265

Merged
merged 7 commits into from
Aug 19, 2016
Merged

Minor modifications to PKCS5KeyFile #265

merged 7 commits into from
Aug 19, 2016

Commits on Aug 19, 2016

  1. Fixed bug wherein PKCS5KeyFile messed up the data if a bad passphrase… 

    … was used, which prevented decryption with a subsequent correct passphrase.

Also, made it possible for subclasses of PKCS5KeyFile to access the decrypted ASN.1 data directly (useful if you want to decrypt then store a PKCS5 key for later use elsewhere).
And I think I made the code a little prettier.
    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    62b8726 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master'

    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    0847e84 View commit details
    Browse the repository at this point in the history

  3. Simplification?

    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    7786468 View commit details
    Browse the repository at this point in the history

  4. Missing import in test.

    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    d198ef1 View commit details
    Browse the repository at this point in the history

  5. Another missing import. This should be it.

    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    f6b4d47 View commit details
    Browse the repository at this point in the history

  6. Moved constant declarations per codacy.

    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    6321685 View commit details
    Browse the repository at this point in the history

  7. Forgot to move 2 fields to the top of the file.

    David Solin authored and David Solin committed Aug 19, 2016
    Configuration menu
    Copy the full SHA
    ed0156c View commit details
    Browse the repository at this point in the history