Browse Source

remove PKDBF2 to ensure mac compat

tags/2.0.1
Jonathan Cobb 4 years ago
parent
commit
e5acc028fd
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      src/main/java/org/cobbzilla/util/security/RsaKeyPair.java

+ 6
- 2
src/main/java/org/cobbzilla/util/security/RsaKeyPair.java View File

@@ -148,7 +148,9 @@ public class RsaKeyPair {
"openssl rand -out secret.key 32 && " +

// encrypt data with symmetric key
"openssl aes-256-cbc -salt -pbkdf2 -in data -out data.enc -pass file:secret.key && " +
// disable PBKDF2, not supported on mac osx
// "openssl aes-256-cbc -salt -pbkdf2 -in data -out data.enc -pass file:secret.key && " +
"openssl aes-256-cbc -salt -in data -out data.enc -pass file:secret.key && " +

// encrypt sym key with recipient's public key
"openssl rsautl -encrypt -oaep -pubin -certin -keyform PEM -inkey recipient.crt -in secret.key -out secret.key.enc && " +
@@ -184,7 +186,9 @@ public class RsaKeyPair {
"openssl rsautl -decrypt -oaep -inkey recipient.key -in secret.key.enc -out secret.key && " +

// decrypt data with symmetric key
"openssl aes-256-cbc -d -salt -pbkdf2 -in data.enc -out data -pass file:secret.key && " +
// disable PBKDF2, not supported on mac osx
// "openssl aes-256-cbc -d -salt -pbkdf2 -in data.enc -out data -pass file:secret.key && " +
"openssl aes-256-cbc -d -salt -in data.enc -out data -pass file:secret.key && " +

// verify signature with sender's public key
"openssl dgst -sha256 -verify <(openssl x509 -in sender.crt -pubkey -noout) -signature data.sig data");


Loading…
Cancel
Save