Commit Graph

108 Commits

Author SHA1 Message Date
Brian Bloniarz
ef3c0ecc60 minimize.sh make file ordering deterministic
Do find | sort | cat instead of find -exec cat when building
resources/openpgp.js. The order of files returned by find isn't
deterministic, which could lead to spurious differences.
2013-02-13 22:34:35 -08:00
Brian Bloniarz
2bb3c30025 openpgp_keyring include subkeys by ID
openpgp_keyring.getPublicKeysForKeyId will now search subkeys
when looking for the ID, and return a key object based on that
subkey.

Updated to add a method, getSubKeyAsKey, to openpgp_msg_publickey.
This returns a full-fledged openpgp_msg_publickey object for a
chosen subkey.
2013-02-13 22:31:27 -08:00
Brian Bloniarz
4a99ed0dfa Add support for GnuPG type 1001 s2k extension
This is a Gnu extension for private keys with stripped secrets, which
can be created by GnuPG's --export-secret-subkeys mode.

Before this patch, "ERROR:  unknown s2k type! 101" would be logged as an
error (though other than that, things seemed to function normally).
2013-02-06 08:36:56 -08:00
Brian Bloniarz
a2f343995a fix array index in verify() with multiple pubkeys.
The log message was showing the Ith userId of the Ith pubkey,
which may not exist. All other code paths use the 0th userid
of the Ith pubkey, do that too.
2013-02-06 08:31:06 -08:00
Brian Bloniarz
b128e2c521 Fix signature check scoping issue.
Signature checks were failing, in the binary-document case of
openpgp_packet_signature.verify() the variable i was being referenced
when there was no i in scope; instead it was getting 8 from a global
variable i, and trimming 8 bytes off the beginning of the data.

The global i was being set by the CAST5 cipher -- this also fixes
that to be a local variable.

Also add unit test to confirm.
2013-02-06 08:26:16 -08:00
Sean Colyer
7528a349fd Merge pull request #59 from seancolyer/master
Merge in refactoring
2013-02-02 15:44:23 -08:00
seancolyer
77974db1a6 Merge branch 'refactor'. Also marking resources/openpgp*.js files as
binary to make some merge/diffing easier.

Conflicts:
	resources/openpgp.js
	resources/openpgp.min.js
2013-01-14 20:44:58 -05:00
AlexanderWillner
66dd6d9df3 do not send empty messages 2013-01-10 18:31:23 +01:00
AlexanderWillner
9ad5116d3c show sent message 2013-01-10 18:31:13 +01:00
Sean Colyer
ca20079efa Merge pull request #58 from freewil/minor-typos
fix 2 minor typos
2013-01-04 16:07:21 -08:00
freewil
7dfda1ebf4 fix 2 minor typos 2013-01-04 11:58:51 -05:00
Sean Colyer
968dca9436 Initial work with refactor. Everything should still be functional, but more cleanup can still be done. 2012-10-07 23:44:58 -04:00
Sean Colyer
15e5705a83 Merge pull request #54 from seancolyer/master
Fix for dynamic packet header lengths, prevent jsxcompressor from endless loop in certain situations.
2012-10-06 08:49:28 -07:00
Sean Colyer
a50c7a7f4d Fix for ZLIB issue (endless loop), and dynamic header lengths. 2012-10-06 11:39:07 -04:00
Sean Colyer
7aa4a83474 Updates to documentation. Most all classes should now be jsdoc compliant. 2012-09-11 21:54:42 -04:00
Sean Colyer
01ddec6431 New jsdoc files. 2012-09-05 22:01:17 -04:00
Sean Colyer
9f4df57679 Added more jsdoc. 2012-09-05 21:59:31 -04:00
Sean Colyer
f1fd8d2288 Merge pull request #53 from toberndo/extract_pkey
Add extractPublicKey() method to private key
2012-09-05 18:16:42 -07:00
Thomas Oberndörfer
051253c383 Add extractPublicKey() method to private key 2012-09-04 10:20:52 +02:00
Sean Colyer
ac64cc55cd Merge pull request #52 from toberndo/zip_compression
Fix endless loop in ZIP decompression
2012-08-27 19:25:08 -07:00
Thomas Oberndörfer
0ec3252ba5 Use JXG for ZIP decompression 2012-08-27 14:33:48 +02:00
Thomas Oberndörfer
4629f41dad Merge remote-tracking branch 'upstream/master' into mainline 2012-08-27 14:04:10 +02:00
Sean Colyer
df3d2fb093 Merge pull request #50 from seancolyer/master
Merging in changes for change to versioning and the initial creation of jsdoc
2012-08-22 05:38:24 -07:00
Sean Colyer
f300b0a1c0 Started modifying inline docs to work with jsdoc3 project, https://github.com/jsdoc3/jsdoc. Built doc based on our source and added to doc directory. Our inline docs need more cleanup, but this document structure looks promising. 2012-08-21 23:23:06 -04:00
Sean Colyer
207313da5a Added major versioning to build process. 2012-08-21 23:22:15 -04:00
Sean Colyer
a82b075a01 Merge branch 'master' of github.com:openpgpjs/openpgpjs into HEAD
Conflicts:
	resources/openpgp.js
	resources/openpgp.min.js
2012-07-30 20:48:10 -04:00
Sean Colyer
bfe37309b0 Change to ignore case when looking up keys. Change to transform both input and keyring keys to use .toLowerCase().
Prompted by: https://github.com/seancolyer/gmail-crypt/issues/12
2012-07-30 20:43:41 -04:00
Sean Colyer
9165232017 Changes to build process to show version number as date rather than hardcoded 0.1. Small doc change. 2012-07-30 20:07:48 -04:00
Sean Colyer
d89dd255a1 Merge pull request #47 from toberndo/zip_comp
Use jsxcompressor for ZLIB compressed data packets
2012-07-05 19:20:33 -07:00
Thomas Oberndörfer
6795e70cb2 Merge branch 'zip_comp' 2012-06-26 17:28:30 +02:00
Thomas Oberndörfer
e42b53199e Use jsxcompressor for ZLIB compressed data packets 2012-06-26 17:06:33 +02:00
Sean Colyer
0cfe4eeffc Chrome plugin import cleanup. 2012-06-25 20:48:46 -04:00
Sean Colyer
456b9f5e31 Merge pull request #46 from toberndo/zip_comp
Merge zip.js and inflate.js into zip.js
2012-06-25 05:52:58 -07:00
Thomas Oberndörfer
028ee46d81 Merge zip.js and inflate.js into zip.js due to dependency in execution order. Remove inflate.js. Add import for zlib compression to test/encryption.html 2012-06-25 10:30:46 +02:00
Sean Colyer
2220d2c494 Merge pull request #43 from toberndo/marker_packet
Support for marker package
2012-06-22 05:46:48 -07:00
Thomas Oberndörfer
0ce9a0587d Cleanup: bring tag type blocks in read_message() in order (non-functional) 2012-06-19 18:01:29 +02:00
Thomas Oberndörfer
717fc47fa4 Fix endless loop in read_message() for messages that start with Marker packet 2012-06-19 18:00:55 +02:00
Sean Colyer
8c2f987f9d Fix tests to import openpgp.crypto.sym.js. 2012-05-18 20:22:40 -04:00
Sean Colyer
3109555137 Added some verification to keyring to check valid email address is being queried. Added a regex to util.js that we can use throughout. 2012-05-07 21:39:43 -04:00
Sean Colyer
245c93440f Added decompression for RFC 1950 - ZLIB. Based this off of the fact that this RFC is heavily dependent on RFC 1951. This solution isn't perfect, it doesn't check the ADLER 32. This is a TODO. 2012-04-29 00:01:07 -04:00
Sean Colyer
66a090c85d Added support for Decompressing messages of Type 1, RFC 1951 - ZIP. 2012-04-28 00:16:00 -04:00
Alex
783c95e761 Merge pull request #41 from openpgpjs/keyring_bugfix
fixed getPrivateKeyForKeyId... I hope
2012-04-24 00:21:45 -07:00
Tankred Hase
7d2723009b fixed getPrivateKeyForKeyId... I hope 2012-04-24 15:14:24 +08:00
Sean Colyer
c86c6043de Fix key generation s2k c value to be a constant 96, which will equate to an iterator of 65536. This is the standard GPG uses. 2012-04-20 21:14:37 -04:00
Sean Colyer
909d41a9ff s2k optimization for large iter values in type 3 s2k. 2012-04-15 23:01:10 -04:00
Sean Colyer
a19c3bf679 Cleanup after merge 2012-04-10 22:11:08 -04:00
Sean Colyer
5aba0b2c46 Merge branch 'master' of github.com:openpgpjs/openpgpjs
Conflicts:
	resources/openpgp.js
	resources/openpgp.min.js
2012-04-10 22:08:51 -04:00
Sean Colyer
7228228d96 Updates to work for s2k with AES encryption. Added numBytes to s2k reading with passphrase to account for s2k encryption with blocksize > hashsize output. 2012-04-10 22:04:29 -04:00
Tankred Hase
3cb44b71dc executed minify script and tested new minified version successfully 2012-04-06 19:55:23 +08:00
Tankred Hase
1f7a503fb1 refactored sha.js internally with module pattern so that it does not require a reference to the window object... external api stays the same 2012-04-06 19:42:44 +08:00