// GPG4Browsers - An OpenPGP implementation in javascript
+// Copyright (C) 2011 Recurity Labs GmbH
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+/**
+ * @requires crypto
+ * @requires enums
+ * @requires packet
+ * @requires type_keyid
+ * @requires key
+ * @module async_proxy
+ */
+
+var crypto = require('../crypto'),
+ packet = require('../packet'),
+ key = require('../key.js'),
+ type_keyid = require('../type/keyid.js'),
+ enums = require('../enums.js');
+
+var INITIAL_RANDOM_SEED = 50000, // random bytes seeded to worker
+ RANDOM_SEED_REQUEST = 20000; // random bytes seeded after worker request
+
+/**
+ * Initializes a new proxy and loads the web worker
+ * @constructor
+ * @param {String} path The path to the worker or 'openpgp.worker.js' by default
+ */
+function AsyncProxy(path) {
+ this.worker = new Worker(path || 'openpgp.worker.js');
+ this.worker.onmessage = this.onMessage.bind(this);
+ this.seedRandom(INITIAL_RANDOM_SEED);
+ // FIFO
+ this.tasks = [];
+}
+
+/**
+ * Message handling
+ */
+AsyncProxy.prototype.onMessage = function(event) {
+ var msg = event.data;
+ switch (msg.event) {
+ case 'method-return':
+ this.tasks.shift()(msg.err ? new Error(msg.err) : null, msg.data);
+ break;
+ case 'request-seed':
+ this.seedRandom(RANDOM_SEED_REQUEST);
+ break;
+ default:
+ throw new Error('Unknown Worker Event.');
+ }
+};
+
+/**
+ * Send message to worker with random data
+ * @param {Integer} size Number of bytes to send
+ */
+AsyncProxy.prototype.seedRandom = function(size) {
+ var buf = this.getRandomBuffer(size);
+ this.worker.postMessage({event: 'seed-random', buf: buf});
+};
+
+/**
+ * Get Uint8Array with random numbers
+ * @param {Integer} size Length of buffer
+ * @return {Uint8Array}
+ */
+AsyncProxy.prototype.getRandomBuffer = function(size) {
+ if (!size) return null;
+ var buf = new Uint8Array(size);
+ crypto.random.getRandomValues(buf);
+ return buf;
+};
+
+/**
+ * Terminates the worker
+ */
+AsyncProxy.prototype.terminate = function() {
+ this.worker.terminate();
+};
+
+/**
+ * Encrypts message text with keys
+ * @param {Array<module:key~Key>} keys array of keys, used to encrypt the message
+ * @param {String} text message as native JavaScript string
+ * @param {Function} callback receives encrypted ASCII armored message
+ */
+AsyncProxy.prototype.encryptMessage = function(keys, text, callback) {
+ keys = keys.map(function(key) {
+ return key.toPacketlist();
+ });
+ this.worker.postMessage({
+ event: 'encrypt-message',
+ keys: keys,
+ text: text
+ });
+ this.tasks.push(callback);
+};
+
+/**
+ * Signs message text and encrypts it
+ * @param {Array<module:key~Key>} publicKeys array of keys, used to encrypt the message
+ * @param {module:key~Key} privateKey private key with decrypted secret key data for signing
+ * @param {String} text message as native JavaScript string
+ * @param {Function} callback receives encrypted ASCII armored message
+ */
+AsyncProxy.prototype.signAndEncryptMessage = function(publicKeys, privateKey, text, callback) {
+ publicKeys = publicKeys.map(function(key) {
+ return key.toPacketlist();
+ });
+ privateKey = privateKey.toPacketlist();
+ this.worker.postMessage({
+ event: 'sign-and-encrypt-message',
+ publicKeys: publicKeys,
+ privateKey: privateKey,
+ text: text
+ });
+ this.tasks.push(callback);
+};
+
+/**
+ * Decrypts message
+ * @param {module:key~Key} privateKey private key with decrypted secret key data
+ * @param {module:message~Message} message the message object with the encrypted data
+ * @param {Function} callback receives decrypted message as as native JavaScript string
+ * or null if no literal data found
+ */
+AsyncProxy.prototype.decryptMessage = function(privateKey, message, callback) {
+ privateKey = privateKey.toPacketlist();
+ this.worker.postMessage({
+ event: 'decrypt-message',
+ privateKey: privateKey,
+ message: message
+ });
+ this.tasks.push(callback);
+};
+
+/**
+ * Decrypts message and verifies signatures
+ * @param {module:key~Key} privateKey private key with decrypted secret key data
+ * @param {Array<module:key~Key>} publicKeys public keys to verify signatures
+ * @param {module:message~Message} message the message object with signed and encrypted data
+ * @param {Function} callback receives decrypted message as as native JavaScript string
+ * with verified signatures or null if no literal data found
+ */
+AsyncProxy.prototype.decryptAndVerifyMessage = function(privateKey, publicKeys, message, callback) {
+ privateKey = privateKey.toPacketlist();
+ publicKeys = publicKeys.map(function(key) {
+ return key.toPacketlist();
+ });
+ this.worker.postMessage({
+ event: 'decrypt-and-verify-message',
+ privateKey: privateKey,
+ publicKeys: publicKeys,
+ message: message
+ });
+ this.tasks.push(function(err, data) {
+ if (data) {
+ data.signatures = data.signatures.map(function(sig) {
+ sig.keyid = type_keyid.fromClone(sig.keyid);
+ return sig;
+ });
+ }
+ callback(err, data);
+ });
+};
+
+/**
+ * Signs a cleartext message
+ * @param {Array<module:key~Key>} privateKeys private key with decrypted secret key data to sign cleartext
+ * @param {String} text cleartext
+ * @param {Function} callback receives ASCII armored message
+ */
+AsyncProxy.prototype.signClearMessage = function(privateKeys, text, callback) {
+ privateKeys = privateKeys.map(function(key) {
+ return key.toPacketlist();
+ });
+ this.worker.postMessage({
+ event: 'sign-clear-message',
+ privateKeys: privateKeys,
+ text: text
+ });
+ this.tasks.push(callback);
+};
+
+/**
+ * Verifies signatures of cleartext signed message
+ * @param {Array<module:key~Key>} publicKeys public keys to verify signatures
+ * @param {module:cleartext~CleartextMessage} message cleartext message object with signatures
+ * @param {Function} callback receives cleartext with status of verified signatures
+ */
+AsyncProxy.prototype.verifyClearSignedMessage = function(publicKeys, message, callback) {
+ publicKeys = publicKeys.map(function(key) {
+ return key.toPacketlist();
+ });
+ this.worker.postMessage({
+ event: 'verify-clear-signed-message',
+ publicKeys: publicKeys,
+ message: message
+ });
+ this.tasks.push(function(err, data) {
+ if (data) {
+ data.signatures = data.signatures.map(function(sig) {
+ sig.keyid = type_keyid.fromClone(sig.keyid);
+ return sig;
+ });
+ }
+ callback(err, data);
+ });
+};
+
+/**
+ * Generates a new OpenPGP key pair. Currently only supports RSA keys.
+ * Primary and subkey will be of same type.
+ * @param {module:enums.publicKey} keyType to indicate what type of key to make.
+ * RSA is 1. See {@link http://tools.ietf.org/html/rfc4880#section-9.1}
+ * @param {Integer} numBits number of bits for the key creation. (should be 1024+, generally)
+ * @param {String} userId assumes already in form of "User Name <username@email.com>"
+ * @param {String} passphrase The passphrase used to encrypt the resulting private key
+ * @param {Function} callback receives object with key and public and private armored texts
+ */
+AsyncProxy.prototype.generateKeyPair = function(keyType, numBits, userId, passphrase, callback) {
+ this.worker.postMessage({
+ event: 'generate-key-pair',
+ keyType: keyType,
+ numBits: numBits,
+ userId: userId,
+ passphrase: passphrase
+ });
+ this.tasks.push(function(err, data) {
+ if (data) {
+ var packetlist = packet.List.fromStructuredClone(data.key);
+ data.key = new key.Key(packetlist);
+ }
+ callback(err, data);
+ });
+};
+
+/**
+ * Decrypts secret part of all secret key packets of key.
+ * @param {module:key~Key} privateKey private key with encrypted secret key data
+ * @param {String} password password to unlock the key
+ * @param {Function} callback receives decrypted key
+ */
+AsyncProxy.prototype.decryptKey = function(privateKey, password, callback) {
+ privateKey = privateKey.toPacketlist();
+ this.worker.postMessage({
+ event: 'decrypt-key',
+ privateKey: privateKey,
+ password: password
+ });
+ this.tasks.push(function(err, data) {
+ if (data) {
+ var packetlist = packet.List.fromStructuredClone(data);
+ data = new key.Key(packetlist);
+ }
+ callback(err, data);
+ });
+};
+
+/**
+ * Decrypts secret part of key packets matching array of keyids.
+ * @param {module:key~Key} privateKey private key with encrypted secret key data
+ * @param {Array<module:type/keyid>} keyIds
+ * @param {String} password password to unlock the key
+ * @param {Function} callback receives decrypted key
+ */
+AsyncProxy.prototype.decryptKeyPacket = function(privateKey, keyIds, password, callback) {
+ privateKey = privateKey.toPacketlist();
+ this.worker.postMessage({
+ event: 'decrypt-key-packet',
+ privateKey: privateKey,
+ keyIds: keyIds,
+ password: password
+ });
+ this.tasks.push(function(err, data) {
+ if (data) {
+ var packetlist = packet.List.fromStructuredClone(data);
+ data = new key.Key(packetlist);
+ }
+ callback(err, data);
+ });
+};
+
+module.exports = AsyncProxy;
+
+ Packet type
+
+
+
+
+ Type:
+-
+
- + +module:enums.packet + + + +
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source:
-
packet/compressed.js, line 44
@@ -361,7 +425,7 @@
- Source:
- @@ -431,7 +495,7 @@ read by read_packet
- Source:
- @@ -548,7 +612,7 @@ read by read_packet
- Source:
- @@ -617,7 +681,7 @@ read by read_packet
- Source:
- @@ -680,13 +744,13 @@ read by read_packet
diff --git a/doc/compressed.html b/doc/compressed.html index c871d025..139a5df7 100644 --- a/doc/compressed.html +++ b/doc/compressed.html @@ -128,13 +128,13 @@ a Signature or One-Pass Signature packet, and contains a literal data packet.
diff --git a/doc/compressed.js.html b/doc/compressed.js.html index 28561ee0..b1a5ee46 100644 --- a/doc/compressed.js.html +++ b/doc/compressed.js.html @@ -64,6 +64,11 @@ var enums = require('../enums.js'), * @constructor */ function Compressed() { + /** + * Packet type + * @type {module:enums.packet} + */ + this.tag = enums.packet.compressed; /** * List of packets * @type {module:packet/packetlist} @@ -204,13 +209,13 @@ Compressed.prototype.compress = function () {
diff --git a/doc/config.html b/doc/config.html index bff00909..5a190bc5 100644 --- a/doc/config.html +++ b/doc/config.html @@ -325,13 +325,13 @@
diff --git a/doc/config.js.html b/doc/config.js.html index cba503f9..7b3537e7 100644 --- a/doc/config.js.html +++ b/doc/config.js.html @@ -84,13 +84,13 @@ module.exports = {
diff --git a/doc/crypto.html b/doc/crypto.html index a85571c2..c2a3582b 100644 --- a/doc/crypto.html +++ b/doc/crypto.html @@ -937,13 +937,13 @@ if elgamal encryption an array of two module:type/mpi is returned; otherwise nul
diff --git a/doc/crypto.js.html b/doc/crypto.js.html index e95f4579..864f02be 100644 --- a/doc/crypto.js.html +++ b/doc/crypto.js.html @@ -261,13 +261,13 @@ module.exports = {
diff --git a/doc/des.html b/doc/des.html index ae4887ae..a1e1676d 100644 --- a/doc/des.html +++ b/doc/des.html @@ -209,13 +209,13 @@
diff --git a/doc/des.js.html b/doc/des.js.html index 9025b53f..23b8761e 100644 --- a/doc/des.js.html +++ b/doc/des.js.html @@ -444,13 +444,13 @@ module.exports = {
diff --git a/doc/dsa.html b/doc/dsa.html index 1232fd96..2e7737f8 100644 --- a/doc/dsa.html +++ b/doc/dsa.html @@ -117,13 +117,13 @@
diff --git a/doc/dsa.js.html b/doc/dsa.js.html index beb986ad..2d80b71c 100644 --- a/doc/dsa.js.html +++ b/doc/dsa.js.html @@ -206,13 +206,13 @@ module.exports = DSA;
diff --git a/doc/elgamal.html b/doc/elgamal.html index d6b0ed7a..143ae854 100644 --- a/doc/elgamal.html +++ b/doc/elgamal.html @@ -115,13 +115,13 @@
diff --git a/doc/elgamal.js.html b/doc/elgamal.js.html index d608b400..99fe3f0e 100644 --- a/doc/elgamal.js.html +++ b/doc/elgamal.js.html @@ -95,13 +95,13 @@ module.exports = Elgamal;
diff --git a/doc/enums.js.html b/doc/enums.js.html index 6bff6113..33de401b 100644 --- a/doc/enums.js.html +++ b/doc/enums.js.html @@ -352,13 +352,13 @@ module.exports = {
diff --git a/doc/hash.html b/doc/hash.html index f7321501..6aeb0e5a 100644 --- a/doc/hash.html +++ b/doc/hash.html @@ -819,13 +819,13 @@
diff --git a/doc/index.html b/doc/index.html index 2e9667e3..46113950 100644 --- a/doc/index.html +++ b/doc/index.html @@ -41,27 +41,35 @@- @@ -102,13 +108,13 @@ module.exports.mapToHex = function (keyId) {OpenPGP.js
+
OpenPGP.js
OpenPGP.js is a Javascript implementation of the OpenPGP protocol. This is defined in RFC 4880.
-How do I use it?
-You can download a prebuilt minified version of the library under releases.
-You can also build a current version yourself:
-
-npm install && gruntThen take
-dist/openpgp.min.jsto use in your project.I need some help
-Mailing List
+
+Node support
+For server side use, install via npm:
+
+npm install openpgpExample:
+
+var openpgp = require('openpgp'); +var key = '-----BEGIN PGP PUBLIC KEY BLOCK ... END PGP PUBLIC KEY BLOCK-----'; +var publicKey = openpgp.key.readArmored(key); +var pgpMessage = openpgp.encryptMessage(publicKey.keys, 'Hello, World!');Browser support
+Fetch a minified build under releases. The library can be loaded via AMD/require.js or accessed globally via
+window.openpgp.OpenPGP.js currently only fully supports browsers that implement
+window.crypto.getRandomValues. If you can help us support more browsers and runtimes, please chip in!Security recommendations
+It should be noted that js crypto apps deployed via regular web hosting (a.k.a. host-based security) provide users with less security than installable apps with auditable static versions. Installable apps can be deployed as a Firefox or Chrome packaged app. These apps are basically signed zip files and their runtimes typically enforce a strict Content Security Policy (CSP) to protect users against XSS. This blogpost explains the trust model of the web quite well.
+It is also recommended to set a strong passphrase that protects the user's private key on disk.
+Development
+To create your own build of the library, just run the following command after cloning the git repo. This will download all dependencies, run the tests and create a minifed bundle under
+dist/openpgp.min.jsto use in your project:
+npm install && npm testDocumentation
+A jsdoc build of our code comments is available at doc/index.html. Public calls should generally be made through the OpenPGP object doc/openpgp.html.
+Mailing List
You can sign up for our mailing list and ask for help there. We've recently worked on getting our archive up and running.
-Documentation
-A jsdoc build of our code comments is available at doc/index.html. Public calls should generally be made through the OpenPGP object doc/openpgp.html.
-How do I get involved?
-You want to help, great! Go ahead and fork our repo, make your changes -and make a pull request.
-It is extra awesome if you write tests for the code you change. Our test coverage is relatively weak, so if you can add cases that is great.
-What License do you use?
+How do I get involved?
+You want to help, great! Go ahead and fork our repo, make your changes and send us a pull request.
+License
GNU Lesser General Public License (2.1). Please take a look at the LICENSE file for more information.
-What are the requirements to use it?
-OpenPGP.js currently only fully supports Chrome. Firefox support should be coming soon with the advent of Firefox 23 with native javascript support for
-window.crypto.getRandomValues. If you can help us support more browsers and situations, please chip in!Resources
+Resources
Below is a collection of resources, many of these were projects that were in someway a precursor to the current OpenPGP.js project. If you'd like to add your link here, please do so in a pull request or email to the list.
- http://www.hanewin.net/encrypt/ @@ -167,13 +175,13 @@ for extending and developing on top of the base library.
diff --git a/doc/index.js.html b/doc/index.js.html index 96bfe4a9..67606c2f 100644 --- a/doc/index.js.html +++ b/doc/index.js.html @@ -40,13 +40,13 @@ module.exports = require('./config.js');
diff --git a/doc/index.js_.html b/doc/index.js_.html index 4a5b9003..75f368db 100644 --- a/doc/index.js_.html +++ b/doc/index.js_.html @@ -60,13 +60,13 @@ for (var i in crypto)
diff --git a/doc/index.js__.html b/doc/index.js__.html index 8677ad3d..0ed3828e 100644 --- a/doc/index.js__.html +++ b/doc/index.js__.html @@ -36,10 +36,10 @@ var desModule = require('./des.js'); module.exports = { - /** @see module:crypto/cipher/des.des */ - des: desModule.des, /** @see module:crypto/cipher/des.originalDes */ - originalDes: desModule.originalDes, + des: desModule.originalDes, + /** @see module:crypto/cipher/des.des */ + tripledes: desModule.des, /** @see module:crypto/cipher/cast5 */ cast5: require('./cast5.js'), /** @see module:crypto/cipher/twofish */ @@ -63,13 +63,13 @@ for (var i in aes) {
diff --git a/doc/index.js___.html b/doc/index.js___.html index bca6cdbf..703b64a1 100644 --- a/doc/index.js___.html +++ b/doc/index.js___.html @@ -123,13 +123,13 @@ module.exports = {
diff --git a/doc/index.js____.html b/doc/index.js____.html index 6b7ccb96..1daeccda 100644 --- a/doc/index.js____.html +++ b/doc/index.js____.html @@ -49,13 +49,13 @@ module.exports = {
diff --git a/doc/index.js_____.html b/doc/index.js_____.html index d17a6c2c..527d598d 100644 --- a/doc/index.js_____.html +++ b/doc/index.js_____.html @@ -41,13 +41,13 @@ module.exports.localstore = require('./localstore.js');
diff --git a/doc/index.js______.html b/doc/index.js______.html index 96bbe43a..1f34a12c 100644 --- a/doc/index.js______.html +++ b/doc/index.js______.html @@ -102,13 +102,13 @@ module.exports.Keyring = require('./keyring');
diff --git a/doc/index.js_______.html b/doc/index.js_______.html index baf6d543..2054b016 100644 --- a/doc/index.js_______.html +++ b/doc/index.js_______.html @@ -49,13 +49,13 @@ for (var i in packets)
diff --git a/doc/jsbn.html b/doc/jsbn.html index 771e93e8..2c7daa73 100644 --- a/doc/jsbn.html +++ b/doc/jsbn.html @@ -111,13 +111,13 @@
diff --git a/doc/jsbn.js.html b/doc/jsbn.js.html index 82ed9c20..6b81f9d6 100644 --- a/doc/jsbn.js.html +++ b/doc/jsbn.js.html @@ -1745,13 +1745,13 @@ BigInteger.prototype.square = bnSquare;
diff --git a/doc/jxg.js.html b/doc/jxg.js.html index 450729ed..249e7471 100644 --- a/doc/jxg.js.html +++ b/doc/jxg.js.html @@ -1297,13 +1297,13 @@ module.exports = JXG;
diff --git a/doc/key.js.html b/doc/key.js.html index 5c9c56d6..259f8200 100644 --- a/doc/key.js.html +++ b/doc/key.js.html @@ -354,17 +354,17 @@ Key.prototype.getPreferredHashAlgorithm = function() { function isValidEncryptionKeyPacket(keyPacket, signature) { return keyPacket.algorithm !== enums.read(enums.publicKey, enums.publicKey.dsa) && keyPacket.algorithm !== enums.read(enums.publicKey, enums.publicKey.rsa_sign) && - ((signature.keyFlags & enums.keyFlags.encrypt_communication) !== 0 || - (signature.keyFlags & enums.keyFlags.encrypt_storage) !== 0 || - !signature.keyFlags); + (!signature.keyFlags || + (signature.keyFlags[0] & enums.keyFlags.encrypt_communication) !== 0 || + (signature.keyFlags[0] & enums.keyFlags.encrypt_storage) !== 0); } function isValidSigningKeyPacket(keyPacket, signature) { return (keyPacket.algorithm == enums.read(enums.publicKey, enums.publicKey.dsa) || keyPacket.algorithm == enums.read(enums.publicKey, enums.publicKey.rsa_sign) || keyPacket.algorithm == enums.read(enums.publicKey, enums.publicKey.rsa_encrypt_sign)) && - ((signature.keyFlags & enums.keyFlags.sign_data) !== 0 || - !signature.keyFlags); + (!signature.keyFlags || + (signature.keyFlags[0] & enums.keyFlags.sign_data) !== 0); } /** @@ -467,12 +467,42 @@ Key.prototype.verifyPrimaryKey = function() { } // check V4 expiration time if (this.primaryKey.version == 4 && primaryUser.selfCertificate.keyNeverExpires === false && - Date.now() > (primaryUser.selfCertificate.created.getTime() + primaryUser.selfCertificate.keyExpirationTime*1000)) { + Date.now() > (this.primaryKey.created.getTime() + primaryUser.selfCertificate.keyExpirationTime*1000)) { return enums.keyStatus.expired; } return enums.keyStatus.valid; }; +/** + * Returns the expiration time of the primary key or null if key does not expire + * @return {Date|null} + */ +Key.prototype.getExpirationTime = function() { + if (this.primaryKey.version == 3) { + return getExpirationTime(this.primaryKey); + } + if (this.primaryKey.version == 4) { + var primaryUser = this.getPrimaryUser(); + if (!primaryUser) { + return null; + } + return getExpirationTime(this.primaryKey, primaryUser.selfCertificate); + } +}; + + +function getExpirationTime(keyPacket, selfCertificate) { + // check V3 expiration time + if (keyPacket.version == 3 && keyPacket.expirationTimeV3 !== 0) { + return new Date(keyPacket.created.getTime() + keyPacket.expirationTimeV3*24*3600*1000); + } + // check V4 expiration time + if (keyPacket.version == 4 && selfCertificate.keyNeverExpires === false) { + return new Date(keyPacket.created.getTime() + selfCertificate.keyExpirationTime*1000); + } + return null; +}; + /** * Returns primary user and most significant (latest valid) self signature * - if multiple users are marked as primary users returns the one with the latest self signature @@ -667,7 +697,7 @@ SubKey.prototype.verify = function(primaryKey) { // check subkey revocation signature if (this.revocationSignature && !this.revocationSignature.isExpired() && (this.revocationSignature.verified || - this.revocationSignature.verify(primaryKey, {key: this.subKey}))) { + this.revocationSignature.verify(primaryKey, {key:primaryKey, bind: this.subKey}))) { return enums.keyStatus.revoked; } // check V3 expiration time @@ -695,6 +725,14 @@ SubKey.prototype.verify = function(primaryKey) { return enums.keyStatus.valid; }; +/** + * Returns the expiration time of the subkey or null if key does not expire + * @return {Date|null} + */ +SubKey.prototype.getExpirationTime = function() { + return getExpirationTime(this.subKey, this.bindingSignature); +}; + /** * Reads an OpenPGP armored text and returns one or multiple key objects * @param {String} armoredText text to be parsed @@ -803,13 +841,13 @@ exports.generate = generate;
diff --git a/doc/keyid-Keyid.html b/doc/keyid-Keyid.html index 80f06a12..30d181f0 100644 --- a/doc/keyid-Keyid.html +++ b/doc/keyid-Keyid.html @@ -254,13 +254,13 @@
diff --git a/doc/keyid.html b/doc/keyid.html index 642c2228..c74c92f1 100644 --- a/doc/keyid.html +++ b/doc/keyid.html @@ -125,13 +125,13 @@ formed.
diff --git a/doc/keyid.js.html b/doc/keyid.js.html index c696fde8..0714fd12 100644 --- a/doc/keyid.js.html +++ b/doc/keyid.js.html @@ -92,6 +92,12 @@ Keyid.prototype.isNull = function() { module.exports.mapToHex = function (keyId) { return keyId.toHex(); }; + +module.exports.fromClone = function (clone) { + var keyid = new Keyid(); + keyid.bytes = clone.bytes; + return keyid; +};
diff --git a/doc/keyring-Keyring.html b/doc/keyring-Keyring.html index f168e72e..b6aab3dc 100644 --- a/doc/keyring-Keyring.html +++ b/doc/keyring-Keyring.html @@ -143,7 +143,7 @@ keyring from HTML5 local storage and initializes this instance.- Source:
- @@ -230,7 +230,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -347,7 +347,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -486,7 +486,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -625,7 +625,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -764,7 +764,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -903,7 +903,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -1042,7 +1042,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -1159,7 +1159,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -1250,7 +1250,7 @@ keyring from HTML5 local storage and initializes this instance.
- Source:
- @@ -1291,13 +1291,13 @@ keyring from HTML5 local storage and initializes this instance.
diff --git a/doc/keyring.html b/doc/keyring.html index 3881d88b..1cd18ce8 100644 --- a/doc/keyring.html +++ b/doc/keyring.html @@ -88,7 +88,11 @@Requires
-
-
- module:openpgp +
- module:enums + +
- module:key + +
- module:util
- Source:
- @@ -431,7 +435,7 @@
- Source:
- @@ -593,7 +597,7 @@
- Source:
- @@ -761,7 +765,7 @@
- Source:
- @@ -822,13 +826,13 @@
diff --git a/doc/keyring.js.html b/doc/keyring.js.html index bd21d815..0cb607b6 100644 --- a/doc/keyring.js.html +++ b/doc/keyring.js.html @@ -44,11 +44,15 @@ /** * The class that deals with storage of the keyring. Currently the only option is to use HTML5 local storage. - * @requires openpgp + * @requires enums + * @requires key + * @requires util * @module keyring/keyring */ -var openpgp = require('../'); +var enums = require('../enums.js'), + keyModule = require('../key.js'), + util = require('../util.js'); /** * Callback to check if a key matches the input @@ -94,7 +98,7 @@ Keyring.prototype.clear = function() { function emailCheck(email, key) { email = email.toLowerCase(); var keyEmails = key.getUserIds(); - for (var i; i < keyEmails.length; i++) { + for (var i = 0; i < keyEmails.length; i++) { //we need to get just the email from the userid key keyEmail = keyEmails[i].split('<')[1].split('>')[0].trim().toLowerCase(); if (keyEmail == email) { @@ -114,7 +118,7 @@ function emailCheck(email, key) { function idCheck(id, key) { var keyids = key.getKeyIds(); for (var i = 0; i < keyids.length; i++) { - if (openpgp.util.hexstrdump(keyids[i].write()) == id) { + if (util.hexstrdump(keyids[i].write()) == id) { return true; } } @@ -134,12 +138,12 @@ function checkForIdentityAndKeyTypeMatch(keys, identityFunction, identityInput, for (var p = 0; p < keys.length; p++) { var key = keys[p]; switch (keyType) { - case openpgp.enums.packet.publicKey: + case enums.packet.publicKey: if (key.isPublic() && identityFunction(identityInput, key)) { results.push(key); } break; - case openpgp.enums.packet.private_key: + case enums.packet.secretKey: if (key.isPrivate() && identityFunction(identityInput, key)) { results.push(key); } @@ -155,7 +159,7 @@ function checkForIdentityAndKeyTypeMatch(keys, identityFunction, identityInput, * @return {Array<module:key~Key>} The public keys associated with provided email address. */ Keyring.prototype.getPublicKeyForAddress = function (email) { - return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, openpgp.enums.packet.publicKey); + return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, enums.packet.publicKey); }; /** @@ -164,7 +168,7 @@ Keyring.prototype.getPublicKeyForAddress = function (email) { * @return {Array<module:key~Key>} private keys found */ Keyring.prototype.getPrivateKeyForAddress = function (email) { - return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, openpgp.enums.packet.secretKey); + return checkForIdentityAndKeyTypeMatch(this.keys, emailCheck, email, enums.packet.secretKey); }; /** @@ -173,7 +177,7 @@ Keyring.prototype.getPrivateKeyForAddress = function (email) { * @return {Array<module:key~Key>} public keys found */ Keyring.prototype.getKeysForKeyId = function (keyId) { - return checkForIdentityAndKeyTypeMatch(this.keys, idCheck, keyId, openpgp.enums.packet.publicKey); + return checkForIdentityAndKeyTypeMatch(this.keys, idCheck, keyId, enums.packet.publicKey); }; /** @@ -181,7 +185,7 @@ Keyring.prototype.getKeysForKeyId = function (keyId) { * @param {String} armored message to read the keys/key from */ Keyring.prototype.importKey = function (armored) { - this.keys = this.keys.concat(openpgp.key.readArmored(armored).keys); + this.keys = this.keys.concat(keyModule.readArmored(armored).keys); return true; }; @@ -224,13 +228,13 @@ Keyring.prototype.exportPublicKey = function (index) {
diff --git a/doc/literal-Literal.html b/doc/literal-Literal.html index bbd4baad..c502c0e8 100644 --- a/doc/literal-Literal.html +++ b/doc/literal-Literal.html @@ -165,7 +165,7 @@- Source:
- @@ -257,7 +257,7 @@ with normalized end of line to \n
- Source:
- @@ -443,7 +443,7 @@ with normalized end of line to \n
- Source:
- @@ -611,7 +611,7 @@ with normalized end of line to \n
- Source:
- @@ -729,7 +729,7 @@ will be normalized to \r\n and by default text is converted to UTF8
- Source:
- @@ -846,7 +846,7 @@ will be normalized to \r\n and by default text is converted to UTF8
- Source:
- @@ -909,13 +909,13 @@ will be normalized to \r\n and by default text is converted to UTF8
diff --git a/doc/literal.html b/doc/literal.html index 314cd785..6ded35b5 100644 --- a/doc/literal.html +++ b/doc/literal.html @@ -125,13 +125,13 @@ is not to be further interpreted.
diff --git a/doc/literal.js.html b/doc/literal.js.html index 583b084f..1b8a8eb0 100644 --- a/doc/literal.js.html +++ b/doc/literal.js.html @@ -61,6 +61,7 @@ var util = require('../util.js'), * @constructor */ function Literal() { + this.tag = enums.packet.literal; this.format = 'utf8'; // default format for literal data packets this.data = ''; // literal data representation as native JavaScript string or bytes this.date = new Date(); @@ -165,13 +166,13 @@ Literal.prototype.write = function () {
diff --git a/doc/localStorage-LocalStorage.html b/doc/localStorage-LocalStorage.html index c8e4989c..0220dd54 100644 --- a/doc/localStorage-LocalStorage.html +++ b/doc/localStorage-LocalStorage.html @@ -277,13 +277,13 @@ if config is null the default config will be used
diff --git a/doc/localStorage.html b/doc/localStorage.html index acf6f3e2..e01cdf19 100644 --- a/doc/localStorage.html +++ b/doc/localStorage.html @@ -114,13 +114,13 @@
diff --git a/doc/localStorage.js.html b/doc/localStorage.js.html index efee00ea..770108c7 100644 --- a/doc/localStorage.js.html +++ b/doc/localStorage.js.html @@ -68,13 +68,13 @@ LocalStorage.prototype.write = function () {
diff --git a/doc/localstore.html b/doc/localstore.html index c30f97df..88ea256c 100644 --- a/doc/localstore.html +++ b/doc/localstore.html @@ -113,13 +113,13 @@
diff --git a/doc/localstore.js.html b/doc/localstore.js.html index e91ddeda..4f3d376c 100644 --- a/doc/localstore.js.html +++ b/doc/localstore.js.html @@ -46,30 +46,39 @@ * The class that deals with storage of the keyring. Currently the only option is to use HTML5 local storage. * @requires openpgp * @module keyring/localstore + * @param {String} item itemname in localstore */ module.exports = LocalStore; var openpgp = require('../'); -function LocalStore() { +function LocalStore(item) { if (typeof window != 'undefined' && window.localStorage) { this.storage = window.localStorage; } else { this.storage = new (require('node-localstorage').LocalStorage)(openpgp.config.node_store); } + if(typeof item == 'string') { + this.item = item; + } } +/* + * Declare the localstore itemname + */ +LocalStore.prototype.item = 'armoredKeys'; + /** * Load the keyring from HTML5 local storage and initializes this instance. * @return {Array<module:key~Key>} array of keys retrieved from localstore */ LocalStore.prototype.load = function () { - var armoredKeys = JSON.parse(this.storage.getItem('armoredKeys')); + var armoredKeys = JSON.parse(this.storage.getItem(this.item)); var keys = []; if (armoredKeys !== null && armoredKeys.length !== 0) { var key; for (var i = 0; i < armoredKeys.length; i++) { - key = openpgp.key.readArmored(armoredKeys[i]); + key = openpgp.key.readArmored(armoredKeys[i]).keys[0]; keys.push(key); } } @@ -86,7 +95,7 @@ LocalStore.prototype.store = function (keys) { for (var i = 0; i < keys.length; i++) { armoredKeys.push(keys[i].armor()); } - this.storage.setItem('armoredKeys', JSON.stringify(armoredKeys)); + this.storage.setItem(this.item, JSON.stringify(armoredKeys)); }; @@ -98,13 +107,13 @@ LocalStore.prototype.store = function (keys) {
diff --git a/doc/marker-Marker.html b/doc/marker-Marker.html index acc6cf79..9a4bdd23 100644 --- a/doc/marker-Marker.html +++ b/doc/marker-Marker.html @@ -78,7 +78,7 @@- Source:
- @@ -260,7 +260,7 @@
- Source:
- @@ -323,13 +323,13 @@
diff --git a/doc/marker.html b/doc/marker.html index 822874ba..36e83fb8 100644 --- a/doc/marker.html +++ b/doc/marker.html @@ -92,6 +92,12 @@ Such a packet MUST be ignored when received. +Requires
+ +-
+
- module:enums +
Classes
@@ -121,13 +127,13 @@ Such a packet MUST be ignored when received.
diff --git a/doc/marker.js.html b/doc/marker.js.html index 65a3b22d..20924e07 100644 --- a/doc/marker.js.html +++ b/doc/marker.js.html @@ -52,15 +52,19 @@ * the Marker packet.<br/> * <br/> * Such a packet MUST be ignored when received. + * @requires enums * @module packet/marker */ module.exports = Marker; +var enums = require('../enums.js'); + /** * @constructor */ function Marker() { + this.tag = enums.packet.marker; } /** @@ -92,13 +96,13 @@ Marker.prototype.read = function (bytes) {
diff --git a/doc/md5.html b/doc/md5.html index a3285294..1fcb29d0 100644 --- a/doc/md5.html +++ b/doc/md5.html @@ -229,13 +229,13 @@
diff --git a/doc/md5.js.html b/doc/md5.js.html index 410150b0..38fe59de 100644 --- a/doc/md5.js.html +++ b/doc/md5.js.html @@ -252,13 +252,13 @@ if (md5('hello') != '5d41402abc4b2a76b9719d911017c592') {
diff --git a/doc/message.js.html b/doc/message.js.html index 840f67c3..bcbb7032 100644 --- a/doc/message.js.html +++ b/doc/message.js.html @@ -195,6 +195,8 @@ Message.prototype.encrypt = function(keys) { //TODO get preferred algo from signature symEncryptedPacket.encrypt(enums.read(enums.symmetric, config.encryption_cipher), sessionKey); packetlist.push(symEncryptedPacket); + // remove packets after encryption + symEncryptedPacket.packets = new packet.List(); return new Message(packetlist); }; @@ -351,13 +353,13 @@ exports.fromBinary = fromBinary;
diff --git a/doc/module-async_proxy-AsyncProxy.html b/doc/module-async_proxy-AsyncProxy.html new file mode 100644 index 00000000..e05f406a --- /dev/null +++ b/doc/module-async_proxy-AsyncProxy.html @@ -0,0 +1,2180 @@ + + + + +JSDoc: Class: AsyncProxy + + + + + + + + + + ++ ++ + + +Class: AsyncProxy
+ + + + + ++ + + + + + ++ + ++ async_proxy~ + + AsyncProxy +
+ ++ + ++ + + + ++ + + + + + + + + + + + + + +- +
+new AsyncProxy(path)
+ + +- + + +
+ + ++ Initializes a new proxy and loads the web worker ++ + + + + + + +Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +path+ + +String + + + + + + + + + +The path to the worker or 'openpgp.worker.js' by default +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
Methods
+ +-
+
+
-
+
decryptAndVerifyMessage(privateKey, publicKeys, message, callback)
+ + +
+ -
+
+
+ + Decrypts message and verifies signatures ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +privateKey+ + +module:key~Key + + + + + + + + + +private key with decrypted secret key data ++ + + + + +publicKeys+ + +Array.<module:key~Key> + + + + + + + + + +public keys to verify signatures ++ + + + + +message+ + +module:message~Message + + + + + + + + + +the message object with signed and encrypted data ++ + + + + +callback+ + +function + + + + + + + + + +receives decrypted message as as native JavaScript string + with verified signatures or null if no literal data found +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
decryptKey(privateKey, password, callback)
+ + +
+ -
+
+
+ + Decrypts secret part of all secret key packets of key. ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +privateKey+ + +module:key~Key + + + + + + + + + +private key with encrypted secret key data ++ + + + + +password+ + +String + + + + + + + + + +password to unlock the key ++ + + + + +callback+ + +function + + + + + + + + + +receives decrypted key +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
decryptKeyPacket(privateKey, keyIds, password, callback)
+ + +
+ -
+
+
+ + Decrypts secret part of key packets matching array of keyids. ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +privateKey+ + +module:key~Key + + + + + + + + + +private key with encrypted secret key data ++ + + + + +keyIds+ + +Array.<module:type/keyid> + + + + + + + + + ++ + + + + + +password+ + +String + + + + + + + + + +password to unlock the key ++ + + + + +callback+ + +function + + + + + + + + + +receives decrypted key +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
decryptMessage(privateKey, message, callback)
+ + +
+ -
+
+
+ + Decrypts message ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +privateKey+ + +module:key~Key + + + + + + + + + +private key with decrypted secret key data ++ + + + + +message+ + +module:message~Message + + + + + + + + + +the message object with the encrypted data ++ + + + + +callback+ + +function + + + + + + + + + +receives decrypted message as as native JavaScript string + or null if no literal data found +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
encryptMessage(keys, text, callback)
+ + +
+ -
+
+
+ + Encrypts message text with keys ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +keys+ + +Array.<module:key~Key> + + + + + + + + + +array of keys, used to encrypt the message ++ + + + + +text+ + +String + + + + + + + + + +message as native JavaScript string ++ + + + + +callback+ + +function + + + + + + + + + +receives encrypted ASCII armored message +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
generateKeyPair(keyType, numBits, userId, passphrase, callback)
+ + +
+ -
+
+
+ + Generates a new OpenPGP key pair. Currently only supports RSA keys. +Primary and subkey will be of same type. ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +keyType+ + +module:enums.publicKey + + + + + + + + + +to indicate what type of key to make. + RSA is 1. See http://tools.ietf.org/html/rfc4880#section-9.1 ++ + + + + +numBits+ + +Integer + + + + + + + + + +number of bits for the key creation. (should be 1024+, generally) ++ + + + + +userId+ + +String + + + + + + + + + +assumes already in form of "User Name ++ + + + + +passphrase+ + +String + + + + + + + + + +The passphrase used to encrypt the resulting private key ++ + + + + +callback+ + +function + + + + + + + + + +receives object with key and public and private armored texts +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
getRandomBuffer(size) → {Uint8Array}
+ + +
+ -
+
+
+ + Get Uint8Array with random numbers ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +size+ + +Integer + + + + + + + + + +Length of buffer +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
Returns:
+ + + + +-
+
- + Type + +
- + +Uint8Array + + + +
+
+
+
+ -
+
onMessage()
+ + +
+ -
+
+
+ + Message handling ++ + + + + + + + + +
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
seedRandom(size)
+ + +
+ -
+
+
+ + Send message to worker with random data ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +size+ + +Integer + + + + + + + + + +Number of bytes to send +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
signAndEncryptMessage(publicKeys, privateKey, text, callback)
+ + +
+ -
+
+
+ + Signs message text and encrypts it ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +publicKeys+ + +Array.<module:key~Key> + + + + + + + + + +array of keys, used to encrypt the message ++ + + + + +privateKey+ + +module:key~Key + + + + + + + + + +private key with decrypted secret key data for signing ++ + + + + +text+ + +String + + + + + + + + + +message as native JavaScript string ++ + + + + +callback+ + +function + + + + + + + + + +receives encrypted ASCII armored message +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
signClearMessage(privateKeys, text, callback)
+ + +
+ -
+
+
+ + Signs a cleartext message ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +privateKeys+ + +Array.<module:key~Key> + + + + + + + + + +private key with decrypted secret key data to sign cleartext ++ + + + + +text+ + +String + + + + + + + + + +cleartext ++ + + + + +callback+ + +function + + + + + + + + + +receives ASCII armored message +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
terminate()
+ + +
+ -
+
+
+ + Terminates the worker ++ + + + + + + + + +
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+
+ -
+
verifyClearSignedMessage(publicKeys, message, callback)
+ + +
+ -
+
+
+ + Verifies signatures of cleartext signed message ++ + + + + + + +
Parameters:
+ + ++ +
+ + + ++ + + + + + + +Name + + +Type + + + + + +Description ++ + + + + +publicKeys+ + +Array.<module:key~Key> + + + + + + + + + +public keys to verify signatures ++ + + + + +message+ + +module:cleartext~CleartextMessage + + + + + + + + + +cleartext message object with signatures ++ + + + + +callback+ + +function + + + + + + + + + +receives cleartext with status of verified signatures +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
+
+
+ + + + + + + \ No newline at end of file diff --git a/doc/module-async_proxy.html b/doc/module-async_proxy.html new file mode 100644 index 00000000..4bff6e8d --- /dev/null +++ b/doc/module-async_proxy.html @@ -0,0 +1,141 @@ + + + + +JSDoc: Module: async_proxy + + + + + + + + + + ++ ++ + + +Module: async_proxy
+ + + + + ++ + + + + + ++ + ++ async_proxy +
+ ++ + ++ + + + + + ++ + + + + + +-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- Source: +
- + + + + + + + +
Requires
+ +-
+
- module:crypto + +
- module:enums + +
- module:packet + +
- module:type_keyid + +
- module:key +
Classes
+ +-
+
- AsyncProxy + +
+ + + + + + + \ No newline at end of file diff --git a/doc/module-cleartext-CleartextMessage.html b/doc/module-cleartext-CleartextMessage.html index 0086b924..e5ed6e4b 100644 --- a/doc/module-cleartext-CleartextMessage.html +++ b/doc/module-cleartext-CleartextMessage.html @@ -741,13 +741,13 @@ See http://tools.ietf.org
diff --git a/doc/module-cleartext.html b/doc/module-cleartext.html index 5f3d7573..f694e2b0 100644 --- a/doc/module-cleartext.html +++ b/doc/module-cleartext.html @@ -267,13 +267,13 @@
diff --git a/doc/module-config.html b/doc/module-config.html index b87babc2..5b9afbae 100644 --- a/doc/module-config.html +++ b/doc/module-config.html @@ -112,13 +112,13 @@
diff --git a/doc/module-crypto.html b/doc/module-crypto.html index 545d9c95..23dc96bf 100644 --- a/doc/module-crypto.html +++ b/doc/module-crypto.html @@ -515,13 +515,13 @@
diff --git a/doc/module-enums.html b/doc/module-enums.html index 097246b8..9b290bd6 100644 --- a/doc/module-enums.html +++ b/doc/module-enums.html @@ -4527,13 +4527,13 @@ document) that cannot include a target subpacket.
diff --git a/doc/module-key-Key.html b/doc/module-key-Key.html index faff0c84..71de64b2 100644 --- a/doc/module-key-Key.html +++ b/doc/module-key-Key.html @@ -752,6 +752,96 @@ Can contain additional subkeys, signatures, user ids, user attributes. +
+
+
+
+-
packet/compressed.js, line 44
@@ -361,7 +425,7 @@
-
+
getExpirationTime() → {Date|null}
+ + +
+ -
+
+
+ + Returns the expiration time of the primary key or null if key does not expire ++ + + + + + + + + + + + + + + + + + + + + +
Returns:
+ + + + +-
+
- + Type + +
- + +Date +| + +null + + + +
@@ -1067,7 +1157,7 @@ Can contain additional subkeys, signatures, user ids, user attributes.
- Source:
- @@ -2252,13 +2342,13 @@ and valid self signature
- Source:
- @@ -125,6 +125,96 @@
-
+
getExpirationTime() → {Date|null}
+ + +
+ -
+
+
+ + Returns the expiration time of the subkey or null if key does not expire ++ + + + + + + + + + + + + + + + + + + + + +
Returns:
+ + + + +-
+
- + Type + +
- + +Date +| + +null + + + +
+
+
+
-
isValidEncryptionKey(primaryKey) → {Boolean}
@@ -218,7 +308,7 @@- Source:
- @@ -356,7 +446,7 @@
- Source:
- @@ -443,7 +533,7 @@
- Source:
- @@ -531,7 +621,7 @@ and valid binding signature
- Source:
- @@ -594,13 +684,13 @@ and valid binding signature
- Source:
- @@ -218,7 +218,7 @@
- Source:
- @@ -383,7 +383,7 @@
- Source:
- @@ -474,7 +474,7 @@
- Source:
- @@ -613,7 +613,7 @@ and validity of self signature
- Source:
- @@ -676,13 +676,13 @@ and validity of self signature
- Source:
- @@ -416,7 +416,7 @@ Primary and subkey will be of same type.
- Source:
- @@ -479,13 +479,13 @@ Primary and subkey will be of same type.
- Source:
- - message.js, line 262 + message.js, line 264
@@ -1004,7 +1004,7 @@ See http://tools.ietf.
- Source:
- - message.js, line 179 + message.js, line 181
@@ -1095,7 +1095,7 @@ See http://tools.ietf.
- Source:
- - message.js, line 249 + message.js, line 251
@@ -1234,7 +1234,7 @@ See http://tools.ietf.
- Source:
- - message.js, line 224 + message.js, line 226
@@ -1297,13 +1297,13 @@ See http://tools.ietf.
- Source:
- - message.js, line 304 + message.js, line 306
@@ -345,7 +345,7 @@
- Source:
- - message.js, line 288 + message.js, line 290
@@ -484,7 +484,7 @@
- Source:
- - message.js, line 272 + message.js, line 274
@@ -547,13 +547,13 @@
-
-
<static> decryptAndVerifyMessage(privateKey, publicKeys, message) → {Object}
+<static> decryptAndVerifyMessage(privateKey, publicKeys, msg, callback) → {Object}
@@ -945,7 +945,7 @@
- Source:
- - openpgp.js, line 96 + openpgp.js, line 133
@@ -1043,7 +1066,7 @@
-
-
<static> decryptMessage(privateKey, message) → {String|null}
+<static> decryptMessage(privateKey, msg, callback) → {String|null}
@@ -1108,7 +1131,7 @@
- Source:
- - openpgp.js, line 81 + openpgp.js, line 110
@@ -1209,7 +1255,7 @@
-
-
<static> encryptMessage(keys, text) → {String}
+<static> encryptMessage(keys, text, callback) → {String}
@@ -1294,6 +1340,29 @@
+
+ - Source:
- - openpgp.js, line 50 + openpgp.js, line 61
@@ -1371,7 +1440,7 @@
-
-
<static> generateKeyPair(keyType, numBits, userId, passphrase) → {Object}
+<static> generateKeyPair(keyType, numBits, userId, passphrase, callback) → {Object}
@@ -1504,6 +1573,29 @@ Primary and subkey will be of same type.
+
+ - Source:
- - openpgp.js, line 149 + openpgp.js, line 210
@@ -1581,7 +1673,7 @@ Primary and subkey will be of same type.
-
-
<static> signAndEncryptMessage(publicKeys, privateKey, text) → {String}
+<static> signAndEncryptMessage(publicKeys, privateKey, text, callback) → {String}
@@ -1689,6 +1781,29 @@ Primary and subkey will be of same type.
+
+ - Source:
- - openpgp.js, line 65 + openpgp.js, line 85
@@ -1766,7 +1881,7 @@ Primary and subkey will be of same type.
-
-
<static> signClearMessage(privateKeys, text) → {String}
+<static> signClearMessage(privateKeys, text, callback) → {String}
@@ -1851,6 +1966,29 @@ Primary and subkey will be of same type.
+
+ - Source:
- - openpgp.js, line 114 + openpgp.js, line 159
@@ -1928,7 +2066,7 @@ Primary and subkey will be of same type.
-
-
<static> verifyClearSignedMessage(publicKeys, message) → {Object}
+<static> verifyClearSignedMessage(publicKeys, msg, callback) → {Object}
@@ -1993,7 +2131,7 @@ Primary and subkey will be of same type.
- Source:
- - openpgp.js, line 128 + openpgp.js, line 181
@@ -2085,6 +2246,261 @@ Primary and subkey will be of same type.
+
diff --git a/doc/module-key-SubKey.html b/doc/module-key-SubKey.html index 5cdce363..4c37e2b3 100644 --- a/doc/module-key-SubKey.html +++ b/doc/module-key-SubKey.html @@ -80,7 +80,7 @@
-
+
diff --git a/doc/module-key-User.html b/doc/module-key-User.html index 074a59bb..789c76bb 100644 --- a/doc/module-key-User.html +++ b/doc/module-key-User.html @@ -80,7 +80,7 @@
diff --git a/doc/module-key.html b/doc/module-key.html index d5947c6a..f2c4b831 100644 --- a/doc/module-key.html +++ b/doc/module-key.html @@ -281,7 +281,7 @@ Primary and subkey will be of same type.
diff --git a/doc/module-keyring.html b/doc/module-keyring.html index 5766cee1..b361ee69 100644 --- a/doc/module-keyring.html +++ b/doc/module-keyring.html @@ -112,13 +112,13 @@
diff --git a/doc/module-message-Message.html b/doc/module-message-Message.html index 359a780c..7da08525 100644 --- a/doc/module-message-Message.html +++ b/doc/module-message-Message.html @@ -217,7 +217,7 @@ See http://tools.ietf.
diff --git a/doc/module-message.html b/doc/module-message.html index 355cff31..b924a451 100644 --- a/doc/module-message.html +++ b/doc/module-message.html @@ -206,7 +206,7 @@
diff --git a/doc/module-openpgp.html b/doc/module-openpgp.html index a56beb5a..9baab72a 100644 --- a/doc/module-openpgp.html +++ b/doc/module-openpgp.html @@ -857,7 +857,7 @@
messagemsgcallbackmessagemsgcallbackcallbackcallbackcallbackcallbackmessagemsgcallback