Code

Minor modifications to PKCS5KeyFile#265

Code

Merged

hierynomus merged 7 commits intohierynomus:masterhierynomus/sshj:masterfrom joval:masterjoval/sshj:masterCopy head branch name to clipboardAug 19, 2016

+137-60

Commits

Commits on Aug 19, 2016

• Fixed bug wherein PKCS5KeyFile messed up the data if a bad passphrase was used, which prevented decryption with a subsequent correct passphrase.

  Show description for 62b8726
  

  David Solin

  authored and

  David Solin

  committed
  62b8726

• Merge remote-tracking branch 'upstream/master'

  

  David Solin

  authored and

  David Solin

  committed
  0847e84

• Simplification?

  

  David Solin

  authored and

  David Solin

  committed
  7786468

• Missing import in test.

  

  David Solin

  authored and

  David Solin

  committed
  d198ef1

• Another missing import. This should be it.

  

  David Solin

  authored and

  David Solin

  committed
  f6b4d47

• Moved constant declarations per codacy.

  

  David Solin

  authored and

  David Solin

  committed
  6321685

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

  

  David Solin

  authored and

  David Solin

  committed
  ed0156c