summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-07-25 09:09:37 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-07-25 09:09:37 +0200
commit6bfe8728e36dd7d5d3c891b36be2173016813d17 (patch)
treef4cd3794bc753df9da2f4ff286b636923bc3be73
parentfe48b234484d3f0e7ddc1f01958ccffb0286d5bf (diff)
parentf203d378bdc156ee5c0cde521fa0f64d831d1bb5 (diff)
downloadorg-mode-6bfe8728e36dd7d5d3c891b36be2173016813d17.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-mobile.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/org-mobile.el b/lisp/org-mobile.el
index 12e6c84..c5b9e10 100644
--- a/lisp/org-mobile.el
+++ b/lisp/org-mobile.el
@@ -693,7 +693,7 @@ encryption program does not understand them."
(defun org-mobile-encrypt-file (infile outfile)
"Encrypt INFILE to OUTFILE, using `org-mobile-encryption-password'."
(shell-command
- (format "openssl enc -aes-256-cbc -salt -pass %s -in %s -out %s"
+ (format "openssl enc -md md5 -aes-256-cbc -salt -pass %s -in %s -out %s"
(shell-quote-argument (concat "pass:"
(org-mobile-encryption-password)))
(shell-quote-argument (expand-file-name infile))
@@ -702,7 +702,7 @@ encryption program does not understand them."
(defun org-mobile-decrypt-file (infile outfile)
"Decrypt INFILE to OUTFILE, using `org-mobile-encryption-password'."
(shell-command
- (format "openssl enc -d -aes-256-cbc -salt -pass %s -in %s -out %s"
+ (format "openssl enc -md md5 -d -aes-256-cbc -salt -pass %s -in %s -out %s"
(shell-quote-argument (concat "pass:"
(org-mobile-encryption-password)))
(shell-quote-argument (expand-file-name infile))