Merge branch 'dev/pgp-worker'

2014-02-17 16:07:50 +01:00 · 2014-02-17 16:07:50 +01:00 · a5aac10730
parent 934a6242b6 9bcce26a4f
commit a5aac10730
2 changed files with 8 additions and 6 deletions
--- a/src/js/crypto/pgp.js
+++ b/src/js/crypto/pgp.js
@ -9,6 +9,7 @@ define(function(require) {
        config = require('js/app-config').config;

    var PGP = function() {
+        openpgp.config.prefer_hash_algorithm = openpgp.enums.hash.sha256;
        openpgp.initWorker(config.workerPath + '/../lib/openpgp/openpgp.worker.js');
    };

--- a/src/lib/openpgp/openpgp.min.js
+++ b/src/lib/openpgp/openpgp.min.js