Commit Graph

582 Commits

Author SHA1 Message Date
evilaliv3
1007637f39 Mark isDecrypted flag when the key is encrypted 2016-04-25 18:35:57 +02:00
evilaliv3
61470ad068 Apply edits as suggested in review of pull #446 2016-04-25 18:35:50 +02:00
Tankred Hase
fd218ef52d Add comments to preferred algorithms 2016-04-25 13:08:00 +02:00
evilaliv3
afc2c95238 Implement feature #443 2016-04-25 00:54:16 +02:00
Tankred Hase
e3b146b9d9 Fix Keyid.fromId() 2016-04-11 12:11:35 +02:00
Tankred Hase
4070e27959 Cleanup of AES-CFB code in integrity protected packet 2016-03-25 16:10:27 +08:00
Tankred Hase
843fba0d40 Use underscore instead of camelcase in config
zeroCopy —> zero_copy
useNative —> use_native
Remove unnecessary tests from build
2016-03-24 21:02:29 +08:00
Tankred Hase
72c8bf5ea7 Deactivate GCM by default 2016-03-24 20:47:42 +08:00
Tankred Hase
969e39dcf2 Rename useAEAD --> nativeAEAD 2016-03-24 13:49:26 +08:00
Tankred Hase
f4fc274f14 Fix: use worker for CFB w/ webcrypto support 2016-03-24 13:24:18 +08:00
Tankred Hase
c8569e0cd5 Add version attribute to the AEAD packet 2016-03-24 10:53:35 +08:00
Tankred Hase
8b46a117ab Prefer aes128 over aes192 (no WebCrypto support) 2016-03-24 10:53:30 +08:00
Tankred Hase
979f212305 Cleanup Promise code 2016-03-24 09:29:41 +08:00
Tankred Hase
ddedb5cb42 Cleanup public api 2016-03-23 21:36:48 +08:00
Tankred Hase
1e3d6468d6 Wrap code into promises to globally catch errors 2016-03-23 21:19:02 +08:00
Tankred Hase
453a9cee07 Use web worker for encrypt/decrypt if no native gcm 2016-03-23 21:17:36 +08:00
Tankred Hase
760bdb8f00 Use only standard window.crypto.subtle in gcm.js
There is currently no support for AES-GCM in IE11 and Safari/iOSqq
2016-03-23 17:27:09 +08:00
Tankred Hase
9b2823aa67 Fix unit tests under node 2016-03-23 16:43:40 +08:00
Tankred Hase
963648c6ea Fix unit tests for browsers 2016-03-23 15:39:51 +08:00
Tankred Hase
e5e76d2eb7 Cleanup gcm.js 2016-03-23 14:32:48 +08:00
Tankred Hase
a225027a6b Wrap message.sign into a promise in openpgp.encrypt 2016-03-23 13:43:12 +08:00
Tankred Hase
7fabe02e03 Fix GCM under node.js 2016-03-23 13:43:06 +08:00
Tankred Hase
8f8218e9de Cleanup and test AEAD protected packet 2016-03-22 17:45:19 +08:00
Tankred Hase
8aa15b66a9 Cleanup and unit test gcm.js 2016-03-22 17:45:19 +08:00
Tankred Hase
365a9d2107 Fix link to IEFT draft packet tag in enums.js 2016-03-22 17:45:18 +08:00
Tankred Hase
2e4d8547a0 Fix typo in src/crypto/index.js 2016-03-22 17:45:18 +08:00
Tankred Hase
149f5d5191 Use promise api in sym_encrypted_* packets 2016-03-22 17:45:18 +08:00
Tankred Hase
ded8926b27 Support AES-GCM with AEAD Protected Data Packets
Closes openpgpjs/openpgpjs#421
2016-03-22 17:44:22 +08:00
Tankred Hase
b5618fd63d Remove redundant util.emailRegEx 2016-02-19 11:17:35 +07:00
Tankred Hase
a1ab02adc8 Revert "Point to TLS/HSTS secured .com domain"
This reverts commit 177d701f5b.
2016-02-18 11:38:12 +07:00
Tankred Hase
506e36c9cc Remove function bind polyfill from worker.js
This is no longer required in Phantom.js 2.x
2016-02-18 11:15:59 +07:00
Tankred Hase
177d701f5b Point to TLS/HSTS secured .com domain 2016-02-15 14:06:31 +07:00
Harry Marr
68d1b5a35c Handle carriage-return only newlines
Newlines are normalised to \r\n, but that previously assumed that only
\r\n and \n newline characters could be used. Even though \r newlines
are rarely used in the wild, it's be helpful to support them. Currently,
they're just removed entirely.
2016-02-14 12:01:19 +00:00
Tankred Hase
e4b2b8208e Add jsdoc annotations to openpgp.js 2016-02-13 16:54:43 +07:00
Tankred Hase
24c213d8d9 Add better examples for binary data use. Fix message docs 2016-02-11 17:36:24 +07:00
Tankred Hase
6c954e19c0 Update README.md with v2.x api examples
Minor cleanup in public api, fix typos in docs
2016-02-11 13:41:53 +07:00
Tankred Hase
d399cb8c47 Fix public api doc whitespaces 2016-02-10 23:19:13 +07:00
Tankred Hase
000c3b3686 Revert "Decode utf8 text only for correct format in Literal.getText()"
This reverts commit 83fcbaa633.
2016-02-10 15:33:45 +07:00
Tankred Hase
d5a2e0fb81 Delete plaintext sessionKey from packet after calling message.encryptSessionKey 2016-02-10 12:58:12 +07:00
Tankred Hase
25131e0df9 Added unit tests for util.getTransferables 2016-02-10 12:52:13 +07:00
Tankred Hase
6547b4ef68 Test encrypt/decryptSessionKey and finalize api, review docs 2016-02-10 12:52:13 +07:00
Tankred Hase
6ff470a36a Cleanup worker.js 2016-02-09 20:35:23 +07:00
Tankred Hase
7d97bcec58 Implement openpgp.decryptKey 2016-02-09 19:04:31 +07:00
Tankred Hase
4f6e036a07 Cleanup packet list clonong --> src/packet/clone.js 2016-02-09 19:01:30 +07:00
Tankred Hase
450a7321d1 Fix typo in util 2016-02-09 17:38:16 +07:00
Tankred Hase
ab68d4b997 Support transferable objects in web worker for zero copy support 2016-02-09 17:01:48 +07:00
Tankred Hase
89df70cbe0 Cleanup src/openpgp.js 2016-02-09 15:37:13 +07:00
Tankred Hase
206f1f9c0f Add 'armor' parameter to sign api 2016-02-09 12:57:23 +07:00
Tankred Hase
c0cc0ee991 Use 'armor' param in encrypt api instead of 'packets' to return full message object 2016-02-09 11:32:35 +07:00
Tankred Hase
994b8d2354 Use generic AsyncProxy.delegate for all public apis 2016-02-09 09:15:52 +07:00
Tankred Hase
f5375ef700 Drastically simplify async_proxy with generic delegate function 2016-02-09 08:46:18 +07:00
Tankred Hase
ee07b77320 Fail gracefully when no web worker support on initWorker 2016-02-09 07:52:08 +07:00
Tankred Hase
b1f6266cc8 Write tests for new api: openpgp.encrypt/decrypt 2016-02-08 23:28:54 +07:00
Tankred Hase
a44e1e5024 Write tests for new api: openpgp.generateKey 2016-02-08 19:32:42 +07:00
Tankred Hase
c7a6a88098 Add type validation util functions 2016-02-08 13:36:21 +07:00
Tankred Hase
1405ec8d1c Return filename for utf8 message 2016-02-08 10:18:37 +07:00
Tankred Hase
f72b4522ad Rename openpgp api: generateKeyPair --> generateKey 2016-02-07 18:01:10 +07:00
Tankred Hase
735ec3df74 Rename openpgp apis: signCleartext --> sign, verifyCleartext --> verify 2016-02-07 17:36:48 +07:00
Tankred Hase
f3ae671a57 Fix @fileoverview comment in hkp module 2016-02-07 08:15:33 +07:00
Tankred Hase
4aaa1d3184 Update copyright notice due to complete rewrite of src/openpgp.js 2016-02-07 08:08:47 +07:00
Tankred Hase
2ad425294c Second draft of public api 2016-02-06 22:58:43 +07:00
Tankred Hase
0f8bfe2dca Rename keys to publicKeys in message.encrypt() 2016-02-06 22:58:43 +07:00
Tankred Hase
31df9c07da Allow either privateKey, session key or password for message.decrypt() 2016-02-06 22:58:43 +07:00
Tankred Hase
83fcbaa633 Decode utf8 text only for correct format in Literal.getText() 2016-02-06 22:58:43 +07:00
Tankred Hase
2754bfef54 Cleanup public api 2016-02-06 22:58:38 +07:00
Tankred Hase
8777289b77 Cleanup config 2016-02-06 19:11:58 +07:00
Tankred Hase
8d82a18c19 Fix bug in message.decryptSessionKey where it would return this (msg obj)
Cleanup message code
2016-02-06 15:03:04 +07:00
Tankred Hase
55110c3409 Remove sessionKeyAlgorithm parameter from message.decrypt()
See: 2010456a19 (commitcomment-12397926)
2016-02-06 14:33:10 +07:00
Tankred Hase
c4bc9b2fe0 Use global this in src/worker/worker.js and add to linting 2016-02-06 14:28:05 +07:00
Tankred Hase
d40c3e81d9 Cleanup code of src/packet/literal.js 2016-02-06 14:22:19 +07:00
Tankred Hase
9da63d56b3 Cleanup style inconsistencies in cfb.js and random.js 2016-02-06 13:36:19 +07:00
Tankred Hase
1997e445f9 Use ES6 destructuring and default parameters in public api 2016-02-05 17:23:17 +07:00
Tankred Hase
f87d8d0433 Fix parsing packets from tag in web worker 2016-02-05 15:39:11 +07:00
Tankred Hase
8728db2b08 Finish refactoring src/**/*.js to use import & export 2016-02-05 15:23:11 +07:00
Tankred Hase
70ac662073 Refactor src/packet/*.js to use import & export 2016-02-05 14:44:22 +07:00
Tankred Hase
9ebe31a4ec Refactor src/worker/*.js to use import and export 2016-02-05 13:20:05 +07:00
Tankred Hase
444128829a Refactor src/keyring/*.js to use import & export 2016-02-05 13:16:42 +07:00
Tankred Hase
acabca9585 Fix config path in hkp.js 2016-02-05 12:45:45 +07:00
Tankred Hase
1157cd2ac8 Move src/hkp/hkp.js -> src/hkp.js
Delete src/hkp/index.js
2016-02-05 12:45:40 +07:00
Tankred Hase
8559cd2bff Refactor src/encoding/*.js and src/hkp/*.js to use import 2016-02-05 12:40:30 +07:00
Tankred Hase
509d6c67ee Refactor src/type/*.js to use import 2016-02-05 10:37:15 +07:00
Tankred Hase
dea42df209 Refactor src/crypto/**/*.js to use import & export 2016-02-05 10:36:09 +07:00
Tankred Hase
3aed324d51 Refactor src/crypto/hash/*.js to use import & export 2016-02-05 09:30:24 +07:00
Tankred Hase
19a97bf117 Refactor src/crypto/cipher/*.js to use import & export 2016-02-05 09:09:04 +07:00
Tankred Hase
60b23169ac Refactor src/config/*.js to use import 2016-02-05 09:09:04 +07:00
Tankred Hase
f06e5aea55 Refactor src/*.js to use import 2016-02-05 09:09:04 +07:00
Tankred Hase
185d575ba3 Refactor src/index.js to re-export ES6 module 2016-02-05 09:09:04 +07:00
Tankred Hase
d725abd5b6 Remove debuggind comments from util 2016-02-04 22:06:48 +07:00
Tankred Hase
bcfc8ef7f7 Use npm published asmcrypto-lite module 2016-02-04 21:47:40 +07:00
Tankred Hase
3bf421206b Further cleanup of sym_encrypted_integrity_protected.js 2016-02-04 16:41:40 +07:00
Tankred Hase
261db8035d Remove redundant message.symEncrypt/symDecrypt 2016-02-04 16:41:39 +07:00
Tankred Hase
c840fabc7d Further cleanup of hash module 2016-02-04 16:41:39 +07:00
Tankred Hase
d67efe22eb Only log errors when config.debug is true 2016-02-04 16:41:38 +07:00
Tankred Hase
316a37a1cd Cleanup hash index.js 2016-02-04 16:41:38 +07:00
Tankred Hase
642f754169 Add more files to linting, make strict mode optional for each file 2016-02-04 16:41:37 +07:00
Tankred Hase
b8f353abe8 Include rusha via npm 2016-02-04 10:05:19 +07:00
Tankred Hase
cfe058596f Include asmCrypto via npm 2016-02-04 09:42:49 +07:00
Tankred Hase
90a7457b71 Refactor most src files to strict mode, delint 2016-02-04 00:37:00 +07:00
Tankred Hase
346aa8f11a Cleanup node.js api detection 2016-02-03 20:24:54 +07:00
Tankred Hase
2f74acc94f Cleanup src/crypto/index.js 2016-02-03 20:24:54 +07:00
Tankred Hase
68d298c948 Fix node.js detection 2016-02-03 20:24:54 +07:00
Tankred Hase
00ea3918c5 Cleanup and linting on all *.js 2016-02-03 20:24:54 +07:00
Tankred Hase
4d325ca65c Cleanup RSA and util code 2016-02-03 20:24:54 +07:00
Tankred Hase
55bd9757e7 Refactor config.useWebCrypto to config.useNative 2016-02-03 20:24:54 +07:00
Bart Butler
469a6be31a Rebase for upload to main openpgpjs repo 2016-02-03 20:24:54 +07:00
Bart Butler
f56b6887d9 native crypto and hash for nodeJS 2016-02-03 20:24:54 +07:00
Bart Butler
4c82568fad hash performance fix 2016-02-03 20:24:54 +07:00
Bart Butler
88a7534b8a Add asmCrypto, native node crypto calls for faster AES 2016-02-03 20:24:54 +07:00
Bart Butler
11038dd946 Add Rusha for fast SHA hashes 2016-02-03 20:24:54 +07:00
Bart Butler
5711028449 does not pass tests yet 2016-02-03 20:24:54 +07:00
Bart Butler
1c6e777a3d bugfixes 2016-02-03 20:24:54 +07:00
Bart Butler
b4916e29a3 binary strings to typed arrays in most places 2016-02-03 20:24:54 +07:00
Bart Butler
b310877c7d fixes 2016-02-03 20:24:54 +07:00
Bart Butler
11a8a99aef add filename to return object when decrypting binary file 2016-02-03 20:24:54 +07:00
Bart Butler
60fb6ba18d direct session key manipulation and encryption/decryption 2016-02-03 20:24:54 +07:00
Bart Butler
91d35ff99c initial modifications 2016-02-03 20:24:54 +07:00
Bart Butler
2e4e9387a0 Fixes for symmetrically encrypted session keys 2016-02-03 20:24:54 +07:00
Tankred Hase
f240feac4b Always polyfill ES6 Promises
Go back to v1.0.0 for Promise polyfill

Add node v5.x to travis build
2016-01-30 16:02:59 +07:00
Tankred Hase
dec7881f93 Don't inject fetch polyfill in hkp module anymore 2016-01-29 20:03:11 +07:00
Tankred Hase
bc5eb03ccd Add var declaration to des.js and use strict mode 2016-01-24 19:55:20 +07:00
evilaliv3
1f995bea22 Fix scope of variables used by des_createKeys in src/crypto/cipher/des.js 2016-01-18 11:58:43 +01:00
evilaliv3
a730d3f7ad Replace check for detecting that an object is a promise 2016-01-07 18:28:40 +01:00
Thomas Oberndörfer
a968f60f0b Keyring: support plain email addresses (without name) as user IDs. 2016-01-07 15:35:47 +01:00
Nick Doiron
ef566b6a3c Specify a filename in encrypt fromBinary [Closes #284] 2016-01-07 15:35:47 +01:00
Thomas Oberndörfer
6f8a3abdfa Support multiple user IDs for key generation 2016-01-07 15:35:47 +01:00
Matthew Shaylor
37ce176d42 If you attempt to store an empty keylist then delete the storage key 2016-01-07 15:35:47 +01:00
Artem Chudinov
068d38d832 Use RegExp.prototype.test instead of String.prototype.match where it is OK
There is no sense in using String.prototype.match if the retrieved matched results
are not used.

By the way, if a bit of performance (especially RAM usage) is preferred over
unification, then, obviously, conditions like
if (/SIGNED MESSAGE/.test(header[1])) {
can be changed to
if (header[1].indexOf('SIGNED MESSAGE') !== -1) {
2016-01-07 15:35:47 +01:00
Artem Chudinov
30926e4738 message.js: Don't use variable signingKeyPacket out of scope 2016-01-07 15:35:47 +01:00
Artem Chudinov
3e2f34ac62 Add missing semicolons 2016-01-07 15:35:47 +01:00
Thomas Oberndörfer
2ee347154c Symmetrically encrypted packet: raise error if MDC is missing for modern cipher. 2016-01-07 15:35:47 +01:00
evilaliv3
9589fa0b52 Apply mixed code review thanks to webstorm inspector 2016-01-07 14:46:55 +01:00
Tankred Hase
85efb463cf Check http status when uploading key 2015-12-27 16:27:55 +07:00
Tankred Hase
450fddaf8e Call encodeURIComponent on hkp query parameters 2015-12-19 15:23:00 +07:00
Tankred Hase
bcde9bfa1a Add HKP lookup example to README 2015-12-12 10:39:38 +07:00
Tankred Hase
6634abf326 Add basic HKP lookup and upload support 2015-12-11 13:12:34 +07:00
Thomas Oberndörfer
668a9bbe70 Throw exception on unsupported S2K type. 2015-10-03 15:57:03 +02:00
Artem Chudinov
9de55b49f3 s2k.js,async_proxy.js: Initialize variable data properly
It fixes error when running the example code (in Node.js with enforced strict
mode) from README.md:

[ReferenceError: data is not defined]
Error: Error generating keypair using js fallback!
    at /tmp/fff/node_modules/openpgp/src/openpgp.js:266:13
    at process._tickDomainCallback (node.js:399:9)
2015-08-19 22:32:06 +05:00
Artem Chudinov
1ee96a3f40 md5.js: Remove an unused variable to support enforced strict mode
The problem was:
arzeth /tmp/test % npm install openpgp
openpgp@1.2.0 node_modules/openpgp
├── node-localstorage@0.3.6
├── es6-promise@1.0.0
└── zlibjs@0.2.0

arzeth /tmp/test % node --version
v3.0.0

arzeth /tmp/test % node
> var openpgp = require('openpgp');
undefined
>

arzeth /tmp/test % node --use_strict
> var openpgp = require('openpgp');
ReferenceError: txt is not defined
    at md51 (/tmp/test/node_modules/openpgp/src/crypto/hash/md5.js:135:7)
    at md5 (/tmp/test/node_modules/openpgp/src/crypto/hash/md5.js:198:14)
    at Object.<anonymous> (/tmp/test/node_modules/openpgp/src/crypto/hash/md5.js:211:5)
    at Module._compile (module.js:430:26)
    at Object.Module._extensions..js (module.js:448:10)
    at Module.load (module.js:355:32)
    at Function.Module._load (module.js:310:12)
    at Module.require (module.js:365:17)
    at require (module.js:384:17)
    at Object.<anonymous> (/tmp/test/node_modules/openpgp/src/crypto/hash/index.js:10:8)
2015-08-19 22:15:21 +05:00
Peter Breitling
07e4278a3a Optimized memory footprint for encrypting and decrypting 2015-06-10 21:12:55 +02:00
Tankred Hase
a12d2ee27e Merge pull request #296 from bartbutler/ie11_keygen
Support for crypto API keygen in IE11 on Windows 7 and 8
2015-06-09 15:43:40 +02:00
Bart Butler
51dbbe2090 tanx update 2 2015-05-22 12:03:59 -07:00
Bart Butler
2a89baa837 tanx updates 2015-05-22 12:02:23 -07:00
Tankred Hase
4d6a34faa1 Implement Symmetric-Key Message Encryption using a passphrase
See https://tools.ietf.org/html/rfc4880#section-3.7.2.2
2015-04-22 01:41:00 +02:00
Thomas Oberndörfer
be6ae2c464 Escape email before using as regular expression in emailCheck method. 2015-03-05 13:32:44 +01:00
Tankred Hase
fca5f7de2b Merge pull request #298 from mailvelope/sig_verify_sub_bind_check
Check validity of key packet before signature verification
2015-03-04 07:17:51 +01:00
Thomas Oberndörfer
a33b8c035d Check validity of key packet before signature verification 2015-03-03 18:15:17 +01:00
Bart Butler
e8465350fc Support for crypto API keygen in IE11 on Windows 7 and 8 2015-02-28 03:43:39 -08:00
Tankred Hase
cb3cc86a88 Add native RSA keygen (WebCrypto) support for Safari/iOS 2015-02-13 22:14:27 +01:00
Tankred Hase
d25c90bff1 Fix AsyncProxy tests 2015-02-11 14:20:42 +01:00
Tankred Hase
da3dbf7acc Set config in AsyncProxy 2015-02-11 14:01:08 +01:00