Commit Graph

148 Commits

Author SHA1 Message Date
Tankred Hase
b951cddd6d add mocha tests for travis CI integration tests on code commit
squash all commits to single commit
2013-10-23 13:25:00 +02:00
seancolyer
b94566a154 Rebuilding binaries. Fixing minor issue with PR#105 2013-10-09 19:09:54 -04:00
Sean Colyer
81fdb00418 Merge pull request #111 from cryptoreddit/patch-1
In Base64 encoding, if result ends in \n, remove it. (Fixes #79, #105)
2013-10-09 16:06:42 -07:00
Sean Colyer
a856396016 Merge pull request #82 from arlolra/bases
Avoid repeating bases in MillerRabin.
2013-10-09 16:05:19 -07:00
Sean Colyer
14e50a4661 Merge pull request #105 from dcposch/master
Fixed ASCII armor decoding bug
2013-10-09 15:44:35 -07:00
Sean Colyer
630492d511 Merge pull request #110 from qnrq/master
Fixes erroneous linefeed handle in write_signed_message()
2013-10-09 15:36:06 -07:00
cryptoreddit
ad1983ac12 In Base64 encoding, if result ends in \n, remove it. (Fixes #79, #105) 2013-10-09 09:58:13 -07:00
Niklas Femerstrand
4379bba2cd Fixes erroneous linefeed handle in write_signed_message()
Fixes #109, courtsey of encomiast
2013-10-09 23:36:46 +07:00
AlexanderWillner
19a5d00d4a ref to test/index.html 2013-09-23 07:42:01 +02:00
DC
d19d1993c6 Fixed ASCII armor decoding bug
Sometimes, there's a blank line between the encoded message body and the checksum line at the end. In those cases, decryption used to crash. Changed only openpgp_encoding_deArmor() in openpgp.encoding.asciiarmor.js to make it resilient to this case.

Cleaned up copy+pasted code in the same function. No other changes.
2013-09-22 20:29:33 -07:00
seancolyer
ba8a964d05 Merge branch 'pr/95'. Had to manually build make because previously
merged pr96.

Conflicts:
	resources/openpgp.js
	resources/openpgp.min.js
2013-08-25 19:11:12 -04:00
Sean Colyer
cab7623ea0 Merge pull request #96 from toberndo/master
Convert userId to UTF8 before generating signature
2013-08-25 16:02:13 -07:00
Thomas Oberndörfer
ee993ec623 Convert userId to UTF8 before generating signature 2013-08-20 16:24:23 +02:00
atrevarrow
86df06f8da Fixed DES/TripleDES padding issues which fixed broken TripleDES unit test; added unit tests for DES padding 2013-08-14 00:33:00 +12:00
Sean Colyer
6a4596fb56 Merge pull request #85 from toberndo/master
DeArmor: remove whitespace of blank line
2013-08-05 17:13:03 -07:00
seancolyer
095198200e Updating README to refer developers to investigate the devel branch. 2013-07-21 20:12:36 -04:00
Thomas Oberndörfer
322f57cc17 Handle wrong UTF8 encodings gracefully 2013-07-12 14:59:38 +02:00
Thomas Oberndörfer
a2db324605 Fix exception in packet.keymaterial.getKeyId() for V3 keys 2013-06-27 11:50:01 +02:00
Thomas Oberndörfer
5898cea4de DeArmor: remove whitespace of blank line 2013-06-25 16:25:10 +02:00
Arlo Breault
ab32d1b9e1 Avoid repeating bases in MillerRabin. 2013-06-15 22:39:32 -07:00
seancolyer
aa8a7f94f1 Switching default hash preference to SHA256. 2013-04-20 22:16:32 -04:00
Sean Colyer
21726d5b8b Merge pull request #72 from dreamingofelectricsheep/ascii-fix
Fixed handling of windows line endings within the ascii dearmoring
2013-04-20 17:40:45 -07:00
Sean Colyer
419af151c1 Merge pull request #73 from dreamingofelectricsheep/utf8-clean
Utf8 support for the encrypted messages (cleanup)
2013-04-20 17:35:58 -07:00
Michal Kolodziej
23295342fc Added utf8 awareness to the literal and userid packet classes. Made s2k
work correctly with utf8 strings. Fixeda visibility issue with the
testing suite and added relevant unit tests.
2013-04-16 10:47:17 +02:00
Michal Kolodziej
ecb340d097 Compiled the library. 2013-04-16 09:28:30 +02:00
Michal Kolodziej
6d7df71c58 Fixed handling of windows line endings within the ascii
dearmoring function.
2013-04-15 16:37:54 +02:00
Sean Colyer
8da7578588 Merge pull request #70 from dreamingofelectricsheep/jsdoc-update
Working automatic documentation generation with the newest version of jsdoc (3.2)
2013-04-13 13:02:11 -07:00
Michal Kolodziej
f06900542e Forgot to add the generated documentation. 2013-04-12 15:11:34 +02:00
Michal Kolodziej
51f8f95807 Finished changing all the javascript files, the documentation
now correctly generates via the use of the makefile.
2013-04-12 14:21:07 +02:00
Michal Kolodziej
6242e72a1d Crypto.sym 2013-04-12 13:04:00 +02:00
Michal Kolodziej
8545feb03d Fixed documentation for cfb and crypto files 2013-04-12 13:00:09 +02:00
seancolyer
a159f838ad Setting README to markdown for proper github rendering. 2013-03-25 21:58:53 -04:00
seancolyer
1400918613 Updating README 2013-03-25 21:57:46 -04:00
seancolyer
f69fa5ccab Fix bug with key material expecting s2k.type to exist which breaks with
passphrase-free keys.
2013-03-06 20:36:26 -05:00
Sean Colyer
1778756c70 Merge pull request #66 from toberndo/hushmail_keys
Fix exception on unknown signature
2013-02-28 05:39:38 -08:00
Sean Colyer
5294db71cc Merge pull request #65 from toberndo/v4subkeys
V4 keys: prefer subkeys for encryption
2013-02-28 05:39:05 -08:00
Thomas Oberndörfer
37ade02c32 Fix exception on unknown signature 2013-02-28 10:28:10 +01:00
Thomas Oberndörfer
a5c1740729 V4 keys: prefer subkeys for encryption 2013-02-28 10:11:53 +01:00
AlexanderWillner
4a00c3b7a7 added browser check 2013-02-20 15:56:27 +01:00
Sean Colyer
eb5e1b99cb Merge pull request #63 from brianbloniarz/master
Several bugfixes involving GnuPG interop
2013-02-16 16:11:40 -08:00
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