suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update Web Worker selection logic for AEAD

Browse Source
This commit is contained in:
Daniel Huigens 2018-04-11 19:47:32 +02:00
parent e061df113c
commit d7efead337
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/openpgp.js
View File

@ -23,6 +23,7 @@
* @requires cleartext * @requires cleartext
* @requires key * @requires key
* @requires config * @requires config
* @requires enums
* @requires util * @requires util
* @requires polyfills * @requires polyfills
* @requires worker/async_proxy * @requires worker/async_proxy
@ -41,6 +42,7 @@ import * as messageLib from './message';
import { CleartextMessage } from './cleartext'; import { CleartextMessage } from './cleartext';
import { generate, reformat } from './key'; import { generate, reformat } from './key';
import config from './config/config'; import config from './config/config';
import enums from './enums';
import util from './util'; import util from './util';
import AsyncProxy from './worker/async_proxy'; import AsyncProxy from './worker/async_proxy';
@ -581,10 +583,15 @@ function onError(message, error) {
} }
/** /**
* Check for AES-GCM support and configuration by the user. Only browsers that * Check for native AEAD support and configuration by the user. Only
* implement the current WebCrypto specification support native AES-GCM. * browsers that implement the current WebCrypto specification support
* native GCM. Native EAX is built on CTR and CBC, which all browsers
* support. OCB and CFB are not natively supported.
* @returns {Boolean} If authenticated encryption should be used * @returns {Boolean} If authenticated encryption should be used
*/ */
function nativeAEAD() { function nativeAEAD() {
return util.getWebCrypto() && config.aead_protect; return config.aead_protect && (
((config.aead_protect_version !== 4 || config.aead_mode === enums.aead.gcm) && util.getWebCrypto()) ||
(config.aead_protect_version === 4 && config.aead_mode === enums.aead.eax && util.getWebCryptoAll())
);
} }