Changes to key generation to allow for creation of keys with passphrase. uses s2k type 3: salt+iter when a passphrase is provided.
This commit is contained in:
Sean Colyer
parent
05ead7e8cd
commit
cd509caa70
|
|
@ -3064,6 +3064,7 @@ function openpgp_packet_keymaterial() {
|
|||
}
|
||||
|
||||
var cleartextMPIslength = cleartextMPIs.length;
|
||||
|
||||
if (this.s2kUsageConventions == 254 &&
|
||||
str_sha1(cleartextMPIs.substring(0,cleartextMPIs.length - 20)) ==
|
||||
cleartextMPIs.substring(cleartextMPIs.length - 20)) {
|
||||
|
|
@ -3328,7 +3329,8 @@ function openpgp_packet_keymaterial() {
|
|||
* @param key [RSA.keyObject]
|
||||
* @return {body: [string]OpenPGP packet body contents, header: [string] OpenPGP packet header, string: [string] header+body}
|
||||
*/
|
||||
function write_private_key(keyType, key){
|
||||
function write_private_key(keyType, key, password, s2kHash, symmetricEncryptionAlgorithm){
|
||||
this.symmetricEncryptionAlgorithm = symmetricEncryptionAlgorithm;
|
||||
var tag = 5;
|
||||
var body = String.fromCharCode(4);
|
||||
//TODO make the date into a util function
|
||||
|
|
@ -3337,25 +3339,66 @@ function openpgp_packet_keymaterial() {
|
|||
body += String.fromCharCode(Math.floor(d/0x1000000%0x100)) + String.fromCharCode(Math.floor(d/0x10000%0x100)) + String.fromCharCode(Math.floor(d/0x100%0x100)) + String.fromCharCode(Math.floor(d%0x100));
|
||||
switch(keyType){
|
||||
case 1:
|
||||
body += String.fromCharCode(1);//public key algo
|
||||
body += String.fromCharCode(keyType);//public key algo
|
||||
body += key.n.toMPI();
|
||||
body += key.ee.toMPI();
|
||||
var algorithmStart = 6; //6 bits of extra info
|
||||
//below shows ske/s2k TODO: currently disabled (no pw)
|
||||
body += String.fromCharCode(0);//1 octet -- s2k, 0 for no s2k
|
||||
//TODO: if s2k == 255,254 then 1 octet symmetric encryption algo
|
||||
//TODO: if s2k == 255,254 then s2k specifier
|
||||
//TODO if s2k, IV of same length as cipher's block
|
||||
body += key.d.toMPI();
|
||||
body += key.p.toMPI();
|
||||
body += key.q.toMPI();
|
||||
body += key.u.toMPI();
|
||||
var algorithmStart = body.length;
|
||||
//below shows ske/s2k
|
||||
if(password){
|
||||
body += String.fromCharCode(254); //octet of 254 indicates s2k with SHA1
|
||||
//if s2k == 255,254 then 1 octet symmetric encryption algo
|
||||
body += String.fromCharCode(this.symmetricEncryptionAlgorithm);
|
||||
//if s2k == 255,254 then s2k specifier
|
||||
body += String.fromCharCode(3); //s2k salt+iter
|
||||
body += String.fromCharCode(s2kHash);
|
||||
//8 octet salt value
|
||||
//1 octet count
|
||||
var cleartextMPIs = key.d.toMPI() + key.p.toMPI() + key.q.toMPI() + key.u.toMPI();
|
||||
var sha1Hash = str_sha1(cleartextMPIs);
|
||||
util.print_debug_hexstr_dump('write_private_key sha1: ',sha1Hash);
|
||||
var salt = openpgp_crypto_getRandomBytes(8);
|
||||
util.print_debug_hexstr_dump('write_private_key Salt: ',salt);
|
||||
body += salt;
|
||||
var c = openpgp_crypto_getSecureRandomOctet();
|
||||
body += String.fromCharCode(c);
|
||||
util.print_debug('write_private_key c: '+ c);
|
||||
var s2k = new openpgp_type_s2k();
|
||||
var hashKey = s2k.write(3, s2kHash, password, salt, c);
|
||||
//if s2k, IV of same length as cipher's block
|
||||
switch(this.symmetricEncryptionAlgorithm){
|
||||
case 3:
|
||||
this.IVLength = 8;
|
||||
this.IV = openpgp_crypto_getRandomBytes(this.IVLength);
|
||||
ciphertextMPIs = normal_cfb_encrypt(function(block, key) {
|
||||
var cast5 = new openpgp_symenc_cast5();
|
||||
cast5.setKey(key);
|
||||
return cast5.encrypt(util.str2bin(block));
|
||||
}, this.IVLength, util.str2bin(hashKey.substring(0,16)), cleartextMPIs + sha1Hash, this.IV);
|
||||
body += this.IV + ciphertextMPIs;
|
||||
break;
|
||||
case 7:
|
||||
case 8:
|
||||
case 9:
|
||||
this.IVLength = 16;
|
||||
this.IV = openpgp_crypto_getRandomBytes(this.IVLength);
|
||||
ciphertextMPIs = normal_cfb_encrypt(AESencrypt,
|
||||
this.IVLength, hashKey, cleartextMPIs + sha1Hash, this.IV);
|
||||
body += this.IV + ciphertextMPIs;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else{
|
||||
body += String.fromCharCode(0);//1 octet -- s2k, 0 for no s2k
|
||||
body += key.d.toMPI() + key.p.toMPI() + key.q.toMPI() + key.u.toMPI();
|
||||
var checksum = util.calc_checksum(key.d.toMPI() + key.p.toMPI() + key.q.toMPI() + key.u.toMPI());
|
||||
body += String.fromCharCode(checksum/0x100) + String.fromCharCode(checksum%0x100);//DEPRECATED:s2k == 0, 255: 2 octet checksum, sum all octets%65536
|
||||
util.print_debug_hexstr_dump('write_private_key basic checksum: '+ checksum);
|
||||
}
|
||||
break;
|
||||
default :
|
||||
body = "";
|
||||
util.print_error("openpgp.packet.keymaterial.js\n"+'error writing private key, unknown type :'+keyType);
|
||||
}
|
||||
body += util.calc_checksum(body.substr(algorithmStart));//DEPRECATED:s2k == 0, 255: 2 octet checksum, sum all octets%65536
|
||||
var header = openpgp_packet.write_packet_header(tag,body.length);
|
||||
return {string: header+body , header: header, body: body};
|
||||
}
|
||||
|
|
@ -9106,20 +9149,23 @@ function normal_cfb_encrypt(blockcipherencryptfn, block_size, key, plaintext, iv
|
|||
var blocki ="";
|
||||
var blockc = "";
|
||||
var pos = 0;
|
||||
var cyphertext = "";
|
||||
blocki[i] = iv.substring(0,block_size);
|
||||
var cyphertext = [];
|
||||
var tempBlock = [];
|
||||
blockc = iv.substring(0,block_size);
|
||||
while (plaintext.length > block_size*pos) {
|
||||
blocka = plaintext.substring((pos*block_size),(pos*block_size)+block_size);
|
||||
var encblock = blockcipherencryptfn(blocki, key);
|
||||
for (var i=0; i < blocka.size; i++)
|
||||
blocki[i] = blocka ^ enblock();
|
||||
cyphertext += blocki;
|
||||
var encblock = blockcipherencryptfn(blockc, key);
|
||||
blocki = plaintext.substring((pos*block_size),(pos*block_size)+block_size);
|
||||
for (var i=0; i < blocki.length; i++)
|
||||
tempBlock.push(String.fromCharCode(blocki.charCodeAt(i) ^ encblock[i]));
|
||||
blockc = tempBlock.join('');
|
||||
tempBlock = [];
|
||||
cyphertext.push(blockc);
|
||||
pos++;
|
||||
}
|
||||
return cyphertext;
|
||||
return cyphertext.join('');
|
||||
}
|
||||
|
||||
function normal_cfb_decrypt(blockcipherencryptfn, block_size, key, ciphertext, iv) {
|
||||
function normal_cfb_decrypt(blockcipherencryptfn, block_size, key, ciphertext, iv) {
|
||||
var blockp ="";
|
||||
var pos = 0;
|
||||
var plaintext = [];
|
||||
|
|
@ -9614,15 +9660,15 @@ function openpgp_crypto_testRSA(key){
|
|||
* @numBits [int] number of bits to make the key to be generated
|
||||
* @return {privateKey: [openpgp_packet_keymaterial] , publicKey: [openpgp_packet_keymaterial]}
|
||||
*/
|
||||
function openpgp_crypto_generateKeyPair(keyType, numBits){
|
||||
function openpgp_crypto_generateKeyPair(keyType, numBits, passphrase, s2kHash, symmetricEncryptionAlgorithm){
|
||||
var privKeyPacket;
|
||||
var publicKeyPacket;
|
||||
switch(keyType){
|
||||
case 1:
|
||||
var rsa = new RSA();
|
||||
var key = rsa.generate(numBits,"10001");
|
||||
privKeyPacket = new openpgp_packet_keymaterial().write_private_key(1, key);
|
||||
publicKeyPacket = new openpgp_packet_keymaterial().write_public_key(1, key);
|
||||
privKeyPacket = new openpgp_packet_keymaterial().write_private_key(keyType, key, passphrase, s2kHash, symmetricEncryptionAlgorithm);
|
||||
publicKeyPacket = new openpgp_packet_keymaterial().write_public_key(keyType, key);
|
||||
break;
|
||||
default:
|
||||
util.print_error("Unknown keytype "+keyType)
|
||||
|
|
@ -9988,13 +10034,15 @@ function _openpgp () {
|
|||
* @userId [string] assumes already in form of "User Name <username@email.com>"
|
||||
* @return {privateKey: [openpgp_msg_privatekey], privateKeyArmored: [string], publicKeyArmored: [string]}
|
||||
*/
|
||||
function generate_key_pair(keyType, numBits, userId){
|
||||
function generate_key_pair(keyType, numBits, userId, passphrase){
|
||||
var userIdPacket = new openpgp_packet_userid();
|
||||
var userIdString = userIdPacket.write_packet(userId);
|
||||
|
||||
var keyPair = openpgp_crypto_generateKeyPair(keyType,numBits);
|
||||
var keyPair = openpgp_crypto_generateKeyPair(keyType,numBits, passphrase, openpgp.config.config.prefer_hash_algorithm, 3);
|
||||
var privKeyString = keyPair.privateKey;
|
||||
var privKeyPacket = new openpgp_packet_keymaterial().read_priv_key(privKeyString.string,3,privKeyString.string.length-3);
|
||||
var privKeyPacket = new openpgp_packet_keymaterial().read_priv_key(privKeyString.string,3,privKeyString.string.length);
|
||||
if(!privKeyPacket.decryptSecretMPIs(passphrase))
|
||||
util.print_error('Issue creating key. Unable to read resulting private key');
|
||||
var privKey = new openpgp_msg_privatekey();
|
||||
privKey.privateKeyPacket = privKeyPacket;
|
||||
privKey.getPreferredSignatureHashAlgorithm = function(){return openpgp.config.config.prefer_hash_algorithm};//need to override this to solve catch 22 to generate signature. 8 is value for SHA256
|
||||
|
|
@ -11347,6 +11395,21 @@ function openpgp_type_s2k() {
|
|||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* writes an s2k hash based on the inputs.
|
||||
* @return [String] produced key of hashAlgorithm hash length
|
||||
*/
|
||||
function write(type, hash, passphrase, salt, c){
|
||||
this.type = type;
|
||||
if(this.type == 3){this.saltValue = salt;
|
||||
this.hashAlgorithm = hash;
|
||||
this.count = (16 + (c & 15)) << ((c >> 4) + 6);
|
||||
this.s2kLength = 10;
|
||||
}
|
||||
return this.produce_key(passphrase);
|
||||
}
|
||||
|
||||
/**
|
||||
* produces a key using the specified passphrase and the defined hashAlgorithm
|
||||
|
|
@ -11369,6 +11432,7 @@ function openpgp_type_s2k() {
|
|||
}
|
||||
|
||||
this.read = read;
|
||||
this.write = write;
|
||||
this.produce_key = produce_key;
|
||||
}
|
||||
// GPG4Browsers - An OpenPGP implementation in javascript
|
||||
|
|
|
|||
44
resources/openpgp.min.js
vendored
44
resources/openpgp.min.js
vendored
|
|
@ -98,10 +98,12 @@ e.toString());default:return this.data=b,this.position=c-this.parentNode.packetL
|
|||
e);a+=e.packetLength+e.headerLength;break;default:return this.data=b,this.position=c-this.parentNode.packetLength,this.len=a-c}this.data=b;this.position=c-this.parentNode.packetLength;return this.len=a-c}util.print_error("openpgp.packet.keymaterial.js\nunknown parent node for a key material packet "+a.tagType)};this.verifyKey=function(){if(14==this.tagType){if(null==this.subKeySignature)return 0;if(4==this.subKeySignature.version&&null!=this.subKeySignature.keyNeverExpires&&!this.subKeySignature.keyNeverExpires&&
|
||||
new Date(1E3*this.subKeySignature.keyExpirationTime+this.creationTime.getTime())<new Date)return 1;var a=String.fromCharCode(153)+this.parentNode.header.substring(1)+this.parentNode.data+String.fromCharCode(153)+this.header.substring(1)+this.packetdata;if(!this.subKeySignature.verify(a,this.parentNode))return 0;for(;0<this.subKeyRevocationSignature.length;)return this.subKeyRevocationSignature[0]&&(a=String.fromCharCode(153)+this.parentNode.header.substring(1)+this.parentNode.data+String.fromCharCode(153)+
|
||||
this.header.substring(1)+this.packetdata),this.subKeyRevocationSignature[0].verify(a,this.parentNode)?2:0}return 3};this.getKeyId=function(){if(4==this.version)return this.getFingerprint().substring(12,20);if(3==this.version&&0<this.publicKeyAlgorithm&&4>this.publicKeyAlgorithm){var a=this.MPIs[0].substring(this.MPIs[0].mpiByteLength-8);util.print_debug("openpgp.msg.publickey read_nodes:\nV3 key ID: "+a);return a}};this.getFingerprint=function(){if(4==this.version)return tohash=String.fromCharCode(153)+
|
||||
String.fromCharCode(this.packetdata.length>>8&255)+String.fromCharCode(this.packetdata.length&255)+this.packetdata,util.print_debug("openpgp.msg.publickey creating subkey fingerprint by hashing:"+util.hexstrdump(tohash)+"\npublickeyalgorithm: "+this.publicKeyAlgorithm),str_sha1(tohash,tohash.length);if(3==this.version&&0<this.publicKeyAlgorithm&&4>this.publicKeyAlgorithm)return MD5(this.MPIs[0].MPI)};this.write_private_key=function(a,b){var c=String.fromCharCode(4),d=new Date,d=d.getTime()/1E3,c=
|
||||
c+(String.fromCharCode(Math.floor(d/16777216%256))+String.fromCharCode(Math.floor(d/65536%256))+String.fromCharCode(Math.floor(d/256%256))+String.fromCharCode(Math.floor(d%256)));switch(a){case 1:var c=c+String.fromCharCode(1),c=c+b.n.toMPI(),c=c+b.ee.toMPI(),e=6,c=c+String.fromCharCode(0),c=c+b.d.toMPI(),c=c+b.p.toMPI(),c=c+b.q.toMPI(),c=c+b.u.toMPI();break;default:c="",util.print_error("openpgp.packet.keymaterial.js\nerror writing private key, unknown type :"+a)}c+=util.calc_checksum(c.substr(e));
|
||||
d=openpgp_packet.write_packet_header(5,c.length);return{string:d+c,header:d,body:c}};this.write_public_key=function(a,b){var c=String.fromCharCode(4),d=new Date,d=d.getTime()/1E3,c=c+(String.fromCharCode(Math.floor(d/16777216%256))+String.fromCharCode(Math.floor(d/65536%256))+String.fromCharCode(Math.floor(d/256%256))+String.fromCharCode(Math.floor(d%256)));switch(a){case 1:c+=String.fromCharCode(1);c+=b.n.toMPI();c+=b.ee.toMPI();break;default:util.print_error("openpgp.packet.keymaterial.js\nerror writing private key, unknown type :"+
|
||||
a)}d=openpgp_packet.write_packet_header(6,c.length);return{string:d+c,header:d,body:c}}}
|
||||
String.fromCharCode(this.packetdata.length>>8&255)+String.fromCharCode(this.packetdata.length&255)+this.packetdata,util.print_debug("openpgp.msg.publickey creating subkey fingerprint by hashing:"+util.hexstrdump(tohash)+"\npublickeyalgorithm: "+this.publicKeyAlgorithm),str_sha1(tohash,tohash.length);if(3==this.version&&0<this.publicKeyAlgorithm&&4>this.publicKeyAlgorithm)return MD5(this.MPIs[0].MPI)};this.write_private_key=function(a,b,c,d,e){this.symmetricEncryptionAlgorithm=e;var e=String.fromCharCode(4),
|
||||
f=new Date,f=f.getTime()/1E3,e=e+(String.fromCharCode(Math.floor(f/16777216%256))+String.fromCharCode(Math.floor(f/65536%256))+String.fromCharCode(Math.floor(f/256%256))+String.fromCharCode(Math.floor(f%256)));switch(a){case 1:e+=String.fromCharCode(a);e+=b.n.toMPI();e+=b.ee.toMPI();if(c){e+=String.fromCharCode(254);e+=String.fromCharCode(this.symmetricEncryptionAlgorithm);e+=String.fromCharCode(3);e+=String.fromCharCode(d);a=b.d.toMPI()+b.p.toMPI()+b.q.toMPI()+b.u.toMPI();b=str_sha1(a);util.print_debug_hexstr_dump("write_private_key sha1: ",
|
||||
b);f=openpgp_crypto_getRandomBytes(8);util.print_debug_hexstr_dump("write_private_key Salt: ",f);var e=e+f,g=openpgp_crypto_getSecureRandomOctet(),e=e+String.fromCharCode(g);util.print_debug("write_private_key c: "+g);c=(new openpgp_type_s2k).write(3,d,c,f,g);switch(this.symmetricEncryptionAlgorithm){case 3:this.IVLength=8;this.IV=openpgp_crypto_getRandomBytes(this.IVLength);ciphertextMPIs=normal_cfb_encrypt(function(a,b){var c=new openpgp_symenc_cast5;c.setKey(b);return c.encrypt(util.str2bin(a))},
|
||||
this.IVLength,util.str2bin(c.substring(0,16)),a+b,this.IV);e+=this.IV+ciphertextMPIs;break;case 7:case 8:case 9:this.IVLength=16,this.IV=openpgp_crypto_getRandomBytes(this.IVLength),ciphertextMPIs=normal_cfb_encrypt(AESencrypt,this.IVLength,c,a+b,this.IV),e+=this.IV+ciphertextMPIs}}else e+=String.fromCharCode(0),e+=b.d.toMPI()+b.p.toMPI()+b.q.toMPI()+b.u.toMPI(),c=util.calc_checksum(b.d.toMPI()+b.p.toMPI()+b.q.toMPI()+b.u.toMPI()),e+=String.fromCharCode(c/256)+String.fromCharCode(c%256),util.print_debug_hexstr_dump("write_private_key basic checksum: "+
|
||||
c);break;default:e="",util.print_error("openpgp.packet.keymaterial.js\nerror writing private key, unknown type :"+a)}c=openpgp_packet.write_packet_header(5,e.length);return{string:c+e,header:c,body:e}};this.write_public_key=function(a,b){var c=String.fromCharCode(4),d=new Date,d=d.getTime()/1E3,c=c+(String.fromCharCode(Math.floor(d/16777216%256))+String.fromCharCode(Math.floor(d/65536%256))+String.fromCharCode(Math.floor(d/256%256))+String.fromCharCode(Math.floor(d%256)));switch(a){case 1:c+=String.fromCharCode(1);
|
||||
c+=b.n.toMPI();c+=b.ee.toMPI();break;default:util.print_error("openpgp.packet.keymaterial.js\nerror writing private key, unknown type :"+a)}d=openpgp_packet.write_packet_header(6,c.length);return{string:d+c,header:d,body:c}}}
|
||||
function MD5(a){function b(a){for(i=0;i<a;i++)this[i]=0;this.length=a}function c(a){return a%4294967296}function d(a,b){a=c(a);b=c(b);return a=0<=a-2147483648?(a%2147483648>>b)+(1073741824>>b-1):a>>b}function e(a,b){for(var a=c(a),b=c(b),d=0;d<b;d++){var e=a,e=e%2147483648;e&1?(e-=1073741824,e*=2,e+=2147483648):e*=2;a=e}return a}function f(a,b){var a=c(a),b=c(b),d=a-2147483648,e=b-2147483648;return 0<=d?0<=e?(d&e)+2147483648:d&b:0<=e?a&e:a&b}function g(a,b){var a=c(a),b=c(b),d=a-2147483648,e=b-2147483648;
|
||||
return 0<=d?0<=e?(d|e)+2147483648:(d|b)+2147483648:0<=e?(a|e)+2147483648:a|b}function h(a,b){var a=c(a),b=c(b),d=a-2147483648,e=b-2147483648;return 0<=d?0<=e?d^e:(d^b)+2147483648:0<=e?(a^e)+2147483648:a^b}function k(a){a=c(a);return 4294967295-a}function l(a,b){return g(e(a,b),d(a,32-b))}function m(a,b,c,d,e,h,R){a=a+g(f(b,c),f(k(b),d))+e+R;a=l(a,h);return a+b}function o(a,b,c,d,e,h,R){a=a+g(f(b,d),f(c,k(d)))+e+R;a=l(a,h);return a+b}function r(a,b,c,d,e,f,g){a=a+h(h(b,c),d)+e+g;a=l(a,f);return a+
|
||||
b}function q(a,b,c,d,e,f,R){a=a+h(c,g(b,k(d)))+e+R;a=l(a,f);return a+b}function s(a){var b;b=f(d(y[0],3),63);4294967288>y[0]||(y[1]++,y[0]-=4294967296);y[0]+=8;z[b]=f(a,255);if(63<=b){var a=z,c=b=0,g=0,h=0,k=v;b=x[0];c=x[1];g=x[2];h=x[3];for(i=0;16>i;i++){k[i]=f(a[4*i+0],255);for(j=1;4>j;j++)k[i]+=e(f(a[4*i+j+0],255),8*j)}b=m(b,c,g,h,k[0],N,3614090360);h=m(h,b,c,g,k[1],M,3905402710);g=m(g,h,b,c,k[2],D,606105819);c=m(c,g,h,b,k[3],K,3250441966);b=m(b,c,g,h,k[4],N,4118548399);h=m(h,b,c,g,k[5],M,1200080426);
|
||||
|
|
@ -346,7 +348,8 @@ function openpgp_cfb_encrypt(a,b,c,d,e,f){var g=Array(d),h=Array(d),a=a+a.charAt
|
|||
d;l++)k+=String.fromCharCode(h[l]^c.charCodeAt(l));for(n=d+2;n<c.length;n+=d){for(l=0;l<d;l++)g[l]=k.charCodeAt(n+l);h=b(g,e);for(l=0;l<d;l++)k+=String.fromCharCode(h[l]^c.charCodeAt(n-2+l))}}else{c=" "+c;for(l=2;l<d;l++)k+=String.fromCharCode(h[l]^c.charCodeAt(l));a=k.substring(0,2*d).split("");k=k.substring(d);for(n=d;n<c.length;n+=d){for(l=0;l<d;l++)g[l]=k.charCodeAt(l);k="";h=b(g,e);for(l=0;l<d;l++)a.push(String.fromCharCode(h[l]^c.charCodeAt(n+l))),k+=String.fromCharCode(h[l]^c.charCodeAt(n+
|
||||
l))}k=a.join("")}return k}function openpgp_cfb_mdc(a,b,c,d){var e=Array(b),f=Array(b),g;for(g=0;g<b;g++)e[g]=0;e=a(e,c);for(g=0;g<b;g++)f[g]=d.charCodeAt(g),e[g]^=f[g];f=a(f,c);return util.bin2str(e)+String.fromCharCode(f[0]^d.charCodeAt(b))+String.fromCharCode(f[1]^d.charCodeAt(b+1))}
|
||||
function openpgp_cfb_decrypt(a,b,c,d,e){util.print_debug("resync:"+e);var f=Array(b),g=Array(b),h,k="",l=[];for(h=0;h<b;h++)f[h]=0;f=a(f,c);for(h=0;h<b;h++)g[h]=d.charCodeAt(h),f[h]^=g[h];g=a(g,c);util.print_debug("openpgp_cfb_decrypt:\niblock:"+util.hexidump(f)+"\nablock:"+util.hexidump(g)+"\n");util.print_debug((g[0]^d.charCodeAt(b)).toString(16)+(g[1]^d.charCodeAt(b+1)).toString(16));if(f[b-2]!=(g[0]^d.charCodeAt(b))||f[b-1]!=(g[1]^d.charCodeAt(b+1)))return util.print_eror("error duding decryption. Symmectric encrypted data not valid."),
|
||||
l.join("");if(e){for(h=0;h<b;h++)f[h]=d.charCodeAt(h+2);k=b+2}else{for(h=0;h<b;h++)f[h]=d.charCodeAt(h);k=b}for(;k<d.length;k+=b){g=a(f,c);for(h=0;h<b&&h+k<d.length;h++)f[h]=d.charCodeAt(k+h),l.push(String.fromCharCode(g[h]^f[h]))}return l.join("")}function normal_cfb_encrypt(a,b,c,d,e){var f=0,g="";for(""[h]=e.substring(0,b);d.length>b*f;){blocka=d.substring(f*b,f*b+b);a("",c);for(var h=0;h<blocka.size;h++)""[h]=blocka^enblock();g+="";f++}return g}
|
||||
l.join("");if(e){for(h=0;h<b;h++)f[h]=d.charCodeAt(h+2);k=b+2}else{for(h=0;h<b;h++)f[h]=d.charCodeAt(h);k=b}for(;k<d.length;k+=b){g=a(f,c);for(h=0;h<b&&h+k<d.length;h++)f[h]=d.charCodeAt(k+h),l.push(String.fromCharCode(g[h]^f[h]))}return l.join("")}
|
||||
function normal_cfb_encrypt(a,b,c,d,e){for(var f="",f="",g=0,h=[],k=[],f=e.substring(0,b);d.length>b*g;){for(var e=a(f,c),f=d.substring(g*b,g*b+b),l=0;l<f.length;l++)k.push(String.fromCharCode(f.charCodeAt(l)^e[l]));f=k.join("");k=[];h.push(f);g++}return h.join("")}
|
||||
function normal_cfb_decrypt(a,b,c,d,e){var f="",g=0,h=[];if(null==e)for(e=0;e<b;e++)f+=String.fromCharCode(0);else f=e.substring(0,b);for(;d.length>b*g;){for(var k=a(f,c),f=d.substring(g*b+0,g*b+b+0),e=0;e<f.length;e++)h.push(String.fromCharCode(f.charCodeAt(e)^k[e]));g++}return h.join("")}
|
||||
function openpgp_crypto_asymetricEncrypt(a,b,c){switch(a){case 1:case 2:case 3:var a=new RSA,d=b[0].toBigInteger(),b=b[1].toBigInteger(),c=c.toBigInteger();return a.encrypt(c,b,d).toMPI();case 16:var a=new Elgamal,d=b[0].toBigInteger(),e=b[1].toBigInteger(),b=b[2].toBigInteger(),c=c.toBigInteger();return a.encrypt(c,e,d,b);default:return null}}
|
||||
function openpgp_crypto_asymetricDecrypt(a,b,c,d){switch(a){case 1:case 2:case 3:var a=new RSA,e=c[0].toBigInteger(),b=c[1].toBigInteger(),f=c[2].toBigInteger(),c=c[3].toBigInteger(),d=d[0].toBigInteger();return a.decrypt(d,e,b,f,c);case 16:return a=new Elgamal,c=c[0].toBigInteger(),e=d[0].toBigInteger(),d=d[1].toBigInteger(),b=b[0].toBigInteger(),a.decrypt(e,d,b,c);default:return null}}
|
||||
|
|
@ -364,20 +367,20 @@ function openpgp_crypto_getHashByteLength(a){switch(a){case 1:return 16;case 2:c
|
|||
function openpgp_crypto_getSecureRandom(a,b){var c=new Uint32Array(1);window.crypto.getRandomValues(c);for(var d=(b-a).toString(2).length;(c[0]&Math.pow(2,d)-1)>b-a;)window.crypto.getRandomValues(c);return a+Math.abs(c[0]&Math.pow(2,d)-1)}function openpgp_crypto_getSecureRandomOctet(){var a=new Uint32Array(1);window.crypto.getRandomValues(a);return a[0]&255}
|
||||
function openpgp_crypto_getRandomBigInteger(a){if(0>a)return null;var b=openpgp_crypto_getRandomBytes(Math.floor((a+7)/8));0<a%8&&(b=String.fromCharCode(Math.pow(2,a%8)-1&b.charCodeAt(0))+b.substring(1));return(new openpgp_type_mpi).create(b).toBigInteger()}function openpgp_crypto_getRandomBigIntegerInRange(a,b){if(!(0>=b.compareTo(a))){for(var c=b.subtract(a),d=openpgp_crypto_getRandomBigInteger(c.bitLength());d>c;)d=openpgp_crypto_getRandomBigInteger(c.bitLength());return a.add(d)}}
|
||||
function openpgp_crypto_testRSA(a){debugger;var b=new RSA,c=new openpgp_type_mpi;c.create(openpgp_encoding_eme_pkcs1_encode("ABABABAB",128));c=b.encrypt(c.toBigInteger(),a.ee,a.n);b.decrypt(c,a.d,a.p,a.q,a.u)}
|
||||
function openpgp_crypto_generateKeyPair(a,b){var c,d;switch(a){case 1:d=(new RSA).generate(b,"10001");c=(new openpgp_packet_keymaterial).write_private_key(1,d);d=(new openpgp_packet_keymaterial).write_public_key(1,d);break;default:util.print_error("Unknown keytype "+a)}return{privateKey:c,publicKey:d}}
|
||||
function _openpgp(){this.tostring="";this.generate_key_pair=function(a,b,c){var d=(new openpgp_packet_userid).write_packet(c),e=openpgp_crypto_generateKeyPair(a,b),b=e.privateKey,f=(new openpgp_packet_keymaterial).read_priv_key(b.string,3,b.string.length-3),a=new openpgp_msg_privatekey;a.privateKeyPacket=f;a.getPreferredSignatureHashAlgorithm=function(){return openpgp.config.config.prefer_hash_algorithm};f=a.privateKeyPacket.publicKey.data;f=String.fromCharCode(153)+String.fromCharCode(f.length>>
|
||||
8&255)+String.fromCharCode(f.length&255)+f+String.fromCharCode(180)+String.fromCharCode(c.length>>24)+String.fromCharCode(c.length>>16&255)+String.fromCharCode(c.length>>8&255)+String.fromCharCode(c.length&255)+c;c=new openpgp_packet_signature;c=c.write_message_signature(16,f,a);e=openpgp_encoding_armor(4,e.publicKey.string+d+c.openpgp);d=openpgp_encoding_armor(5,b.string+d+c.openpgp);return{privateKey:a,privateKeyArmored:d,publicKeyArmored:e}};this.write_signed_message=function(a,b){var c=(new openpgp_packet_signature).write_message_signature(1,
|
||||
b.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),a),c={text:b.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),openpgp:c.openpgp,hash:c.hash};return openpgp_encoding_armor(2,c,null,null)};this.write_signed_and_encrypted_message=function(a,b,c){var d="",e=(new openpgp_packet_literaldata).write_packet(c.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));util.print_debug_hexstr_dump("literal_packet: |"+e+"|\n",e);for(var f=0;f<b.length;f++){var g="",g=(new openpgp_packet_onepasssignature).write_packet(1,openpgp.config.config.prefer_hash_algorithm,
|
||||
a,!1);util.print_debug_hexstr_dump("onepasssigstr: |"+g+"|\n",g);var h=(new openpgp_packet_signature).write_message_signature(1,c.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"),a);util.print_debug_hexstr_dump("datasignature: |"+h.openpgp+"|\n",h.openpgp);d=0==f?g+e+h.openpgp:g+d+h.openpgp}util.print_debug_hexstr_dump("signed packet: |"+d+"|\n",d);a=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher);c="";for(f=0;f<b.length;f++){e=b[f].getEncryptionKey();if(null==e)return util.print_error("no encryption key found! Key is for signing only."),
|
||||
null;c+=(new openpgp_packet_encryptedsessionkey).write_pub_key_packet(e.getKeyId(),e.MPIs,e.publicKeyAlgorithm,openpgp.config.config.encryption_cipher,a)}c=openpgp.config.config.integrity_protect?c+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,a,d):c+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,a,d);return openpgp_encoding_armor(3,c,null,null)};this.write_encrypted_message=function(a,b){var c="",
|
||||
c=(new openpgp_packet_literaldata).write_packet(b.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));util.print_debug_hexstr_dump("literal_packet: |"+c+"|\n",c);for(var d=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher),e="",f=0;f<a.length;f++){var g=a[f].getEncryptionKey();if(null==g)return util.print_error("no encryption key found! Key is for signing only."),null;e+=(new openpgp_packet_encryptedsessionkey).write_pub_key_packet(g.getKeyId(),g.MPIs,g.publicKeyAlgorithm,openpgp.config.config.encryption_cipher,
|
||||
d)}e=openpgp.config.config.integrity_protect?e+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,d,c):e+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,d,c);return openpgp_encoding_armor(3,e,null,null)};this.read_message=function(a){var b;try{b=openpgp_encoding_deArmor(a.replace(/\r/g,""))}catch(c){return util.print_error("no message found!"),null}for(var a=b.openpgp,d=[],e=0,f=0,g=a.length;f<a.length;){var h=
|
||||
openpgp_packet.read_packet(a,f,g);if(1==h.tagType||2==h.tagType&&16>h.signatureType||3==h.tagType||8==h.tagType||9==h.tagType||10==h.tagType||11==h.tagType||18==h.tagType||19==h.tagType)if(d[d.length]=new openpgp_msg_message,d[e].messagePacket=h,d[e].type=b.type,9==h.tagType||1==h.tagType||3==h.tagType||18==h.tagType)if(9==h.tagType){util.print_error("unexpected openpgp packet");break}else if(1==h.tagType){util.print_debug("session key found:\n "+h.toString());var k=!0;d[e].sessionKeys=[];for(var l=
|
||||
0;k;)d[e].sessionKeys[l]=h,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength,h=openpgp_packet.read_packet(a,f,g),1!=h.tagType&&3!=h.tagType&&(k=!1),l++;18==h.tagType||9==h.tagType?(util.print_debug("encrypted data found:\n "+h.toString()),d[e].encryptedData=h,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength,e++):util.print_debug("something is wrong: "+h.tagType)}else{if(18==h.tagType){util.print_debug("symmetric encrypted data");break}}else if(2==h.tagType&&3>h.signatureType){d[e].text=
|
||||
b.text;d[e].signature=h;break}else if(8==h.tagType){util.print_error("A directly compressed message is currently not supported");break}else{if(11==h.tagType){util.print_error("A direct literal message is currently not supported.");break}}else return util.print_error("no message found!"),null}return d};this.read_publicKey=function(a){for(var b=0,c=[],d=0,a=openpgp_encoding_deArmor(a.replace(/\r/g,"")).openpgp,e=a.length;b!=a.length;){var f=openpgp_packet.read_packet(a,b,e);if(153==a[b].charCodeAt()||
|
||||
6==f.tagType)c[d]=new openpgp_msg_publickey,c[d].header=a.substring(b,b+3),153==a[b].charCodeAt()?(b++,e=a[b++].charCodeAt()<<8|a[b++].charCodeAt(),c[d].publicKeyPacket=new openpgp_packet_keymaterial,c[d].publicKeyPacket.header=c[d].header,c[d].publicKeyPacket.read_tag6(a,b,e),b+=c[d].publicKeyPacket.packetLength,b+=c[d].read_nodes(c[d].publicKeyPacket,a,b,a.length-b)):(c[d]=new openpgp_msg_publickey,c[d].publicKeyPacket=f,b+=f.headerLength+f.packetLength,b+=c[d].read_nodes(f,a,b,a.length-b));else return util.print_error("no public key found!"),
|
||||
null;c[d].data=a.substring(0,b);d++}return c};this.read_privateKey=function(a){for(var b=[],c=0,d=0,a=openpgp_encoding_deArmor(a.replace(/\r/g,"")).openpgp,e=a.length;d!=a.length;){var f=openpgp_packet.read_packet(a,d,e);if(5==f.tagType)b[b.length]=new openpgp_msg_privatekey,d+=f.headerLength+f.packetLength,d+=b[c].read_nodes(f,a,d,e);else return util.print_error("no block packet found!"),null;b[c].data=a.substring(0,d);c++}return b};this.init=function(){this.config=new openpgp_config;this.config.read();
|
||||
this.keyring=new openpgp_keyring;this.keyring.init()}}var openpgp=new _openpgp;
|
||||
function openpgp_crypto_generateKeyPair(a,b,c,d,e){var f,g;switch(a){case 1:b=(new RSA).generate(b,"10001");f=(new openpgp_packet_keymaterial).write_private_key(a,b,c,d,e);g=(new openpgp_packet_keymaterial).write_public_key(a,b);break;default:util.print_error("Unknown keytype "+a)}return{privateKey:f,publicKey:g}}
|
||||
function _openpgp(){this.tostring="";this.generate_key_pair=function(a,b,c,d){var e=(new openpgp_packet_userid).write_packet(c),b=openpgp_crypto_generateKeyPair(a,b,d,openpgp.config.config.prefer_hash_algorithm,3),a=b.privateKey,f=(new openpgp_packet_keymaterial).read_priv_key(a.string,3,a.string.length);f.decryptSecretMPIs(d)||util.print_error("Issue creating key. Unable to read resulting private key");d=new openpgp_msg_privatekey;d.privateKeyPacket=f;d.getPreferredSignatureHashAlgorithm=function(){return openpgp.config.config.prefer_hash_algorithm};
|
||||
f=d.privateKeyPacket.publicKey.data;f=String.fromCharCode(153)+String.fromCharCode(f.length>>8&255)+String.fromCharCode(f.length&255)+f+String.fromCharCode(180)+String.fromCharCode(c.length>>24)+String.fromCharCode(c.length>>16&255)+String.fromCharCode(c.length>>8&255)+String.fromCharCode(c.length&255)+c;c=new openpgp_packet_signature;c=c.write_message_signature(16,f,d);b=openpgp_encoding_armor(4,b.publicKey.string+e+c.openpgp);e=openpgp_encoding_armor(5,a.string+e+c.openpgp);return{privateKey:d,
|
||||
privateKeyArmored:e,publicKeyArmored:b}};this.write_signed_message=function(a,b){var c=(new openpgp_packet_signature).write_message_signature(1,b.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),a),c={text:b.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),openpgp:c.openpgp,hash:c.hash};return openpgp_encoding_armor(2,c,null,null)};this.write_signed_and_encrypted_message=function(a,b,c){var d="",e=(new openpgp_packet_literaldata).write_packet(c.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));util.print_debug_hexstr_dump("literal_packet: |"+
|
||||
e+"|\n",e);for(var f=0;f<b.length;f++){var g="",g=(new openpgp_packet_onepasssignature).write_packet(1,openpgp.config.config.prefer_hash_algorithm,a,!1);util.print_debug_hexstr_dump("onepasssigstr: |"+g+"|\n",g);var h=(new openpgp_packet_signature).write_message_signature(1,c.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"),a);util.print_debug_hexstr_dump("datasignature: |"+h.openpgp+"|\n",h.openpgp);d=0==f?g+e+h.openpgp:g+d+h.openpgp}util.print_debug_hexstr_dump("signed packet: |"+d+"|\n",d);a=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher);
|
||||
c="";for(f=0;f<b.length;f++){e=b[f].getEncryptionKey();if(null==e)return util.print_error("no encryption key found! Key is for signing only."),null;c+=(new openpgp_packet_encryptedsessionkey).write_pub_key_packet(e.getKeyId(),e.MPIs,e.publicKeyAlgorithm,openpgp.config.config.encryption_cipher,a)}c=openpgp.config.config.integrity_protect?c+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,a,d):c+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,
|
||||
a,d);return openpgp_encoding_armor(3,c,null,null)};this.write_encrypted_message=function(a,b){var c="",c=(new openpgp_packet_literaldata).write_packet(b.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));util.print_debug_hexstr_dump("literal_packet: |"+c+"|\n",c);for(var d=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher),e="",f=0;f<a.length;f++){var g=a[f].getEncryptionKey();if(null==g)return util.print_error("no encryption key found! Key is for signing only."),null;e+=(new openpgp_packet_encryptedsessionkey).write_pub_key_packet(g.getKeyId(),
|
||||
g.MPIs,g.publicKeyAlgorithm,openpgp.config.config.encryption_cipher,d)}e=openpgp.config.config.integrity_protect?e+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,d,c):e+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,d,c);return openpgp_encoding_armor(3,e,null,null)};this.read_message=function(a){var b;try{b=openpgp_encoding_deArmor(a.replace(/\r/g,""))}catch(c){return util.print_error("no message found!"),
|
||||
null}for(var a=b.openpgp,d=[],e=0,f=0,g=a.length;f<a.length;){var h=openpgp_packet.read_packet(a,f,g);if(1==h.tagType||2==h.tagType&&16>h.signatureType||3==h.tagType||8==h.tagType||9==h.tagType||10==h.tagType||11==h.tagType||18==h.tagType||19==h.tagType)if(d[d.length]=new openpgp_msg_message,d[e].messagePacket=h,d[e].type=b.type,9==h.tagType||1==h.tagType||3==h.tagType||18==h.tagType)if(9==h.tagType){util.print_error("unexpected openpgp packet");break}else if(1==h.tagType){util.print_debug("session key found:\n "+
|
||||
h.toString());var k=!0;d[e].sessionKeys=[];for(var l=0;k;)d[e].sessionKeys[l]=h,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength,h=openpgp_packet.read_packet(a,f,g),1!=h.tagType&&3!=h.tagType&&(k=!1),l++;18==h.tagType||9==h.tagType?(util.print_debug("encrypted data found:\n "+h.toString()),d[e].encryptedData=h,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength,e++):util.print_debug("something is wrong: "+h.tagType)}else{if(18==h.tagType){util.print_debug("symmetric encrypted data");
|
||||
break}}else if(2==h.tagType&&3>h.signatureType){d[e].text=b.text;d[e].signature=h;break}else if(8==h.tagType){util.print_error("A directly compressed message is currently not supported");break}else{if(11==h.tagType){util.print_error("A direct literal message is currently not supported.");break}}else return util.print_error("no message found!"),null}return d};this.read_publicKey=function(a){for(var b=0,c=[],d=0,a=openpgp_encoding_deArmor(a.replace(/\r/g,"")).openpgp,e=a.length;b!=a.length;){var f=
|
||||
openpgp_packet.read_packet(a,b,e);if(153==a[b].charCodeAt()||6==f.tagType)c[d]=new openpgp_msg_publickey,c[d].header=a.substring(b,b+3),153==a[b].charCodeAt()?(b++,e=a[b++].charCodeAt()<<8|a[b++].charCodeAt(),c[d].publicKeyPacket=new openpgp_packet_keymaterial,c[d].publicKeyPacket.header=c[d].header,c[d].publicKeyPacket.read_tag6(a,b,e),b+=c[d].publicKeyPacket.packetLength,b+=c[d].read_nodes(c[d].publicKeyPacket,a,b,a.length-b)):(c[d]=new openpgp_msg_publickey,c[d].publicKeyPacket=f,b+=f.headerLength+
|
||||
f.packetLength,b+=c[d].read_nodes(f,a,b,a.length-b));else return util.print_error("no public key found!"),null;c[d].data=a.substring(0,b);d++}return c};this.read_privateKey=function(a){for(var b=[],c=0,d=0,a=openpgp_encoding_deArmor(a.replace(/\r/g,"")).openpgp,e=a.length;d!=a.length;){var f=openpgp_packet.read_packet(a,d,e);if(5==f.tagType)b[b.length]=new openpgp_msg_privatekey,d+=f.headerLength+f.packetLength,d+=b[c].read_nodes(f,a,d,e);else return util.print_error("no block packet found!"),null;
|
||||
b[c].data=a.substring(0,d);c++}return b};this.init=function(){this.config=new openpgp_config;this.config.read();this.keyring=new openpgp_keyring;this.keyring.init()}}var openpgp=new _openpgp;
|
||||
function openpgp_msg_publickey(){this.tostring="OPENPGP PUBLIC KEY\n";this.publicKeyPacket=this.bindingSignature=null;this.userIds=[];this.userAttributes=[];this.revocationSignatures=[];this.subKeys=[];this.arbitraryPacket=[];this.directSignatures=[];this.verifyCertificationSignatures=function(){for(var a=[],b=0;b<this.userIds.length;b++)a[b]=this.userIds[b].verifyCertificationSignatures(this.publicKeyPacket);return a};this.getEncryptionKey=function(){if(17!=this.publicKeyPacket.publicKeyAlgorithm&&
|
||||
3!=this.publicKeyPacket.publicKeyAlgorithm&&this.publicKeyPacket.verifyKey())return this.publicKeyPacket;if(4==this.publicKeyPacket.version)for(var a=0;a<this.subKeys.length;a++)if(17!=this.subKeys[a].publicKeyAlgorithm&&3!=this.subKeys[a].publicKeyAlgorithm&&this.subKeys[a].verifyKey())return this.subKeys[a];return null};this.getSigningKey=function(){if(17==this.publicKeyPacket.publicKeyAlgorithm||2!=this.publicKeyPacket.publicKeyAlgorithm)return this.publicKeyPacket;if(4==this.publicKeyPacket.version)for(var a=
|
||||
0;a<this.subKeys.length;a++)if((17==this.subKeys[a].publicKeyAlgorithm||2!=this.subKeys[a].publicKeyAlgorithm)&&this.subKeys[a].verifyKey())return this.subKeys[a];return null};this.read_nodes=function(a,b,c,d){this.publicKeyPacket=a;for(a=c;b.length!=a;){var e=openpgp_packet.read_packet(b,a,b.length-a);if(null==e){util.print_error("openpgp.msg.publickey read_nodes:\n[pub_key]parsing ends here @:"+a+" l:"+d);break}else switch(e.tagType){case 2:32==e.signatureType?this.revocationSignatures[this.revocationSignatures.length]=
|
||||
|
|
@ -427,7 +430,8 @@ function openpgp_type_mpi(){this.data=this.mpiByteLength=this.mpiBitLength=this.
|
|||
this.toString=function(){var a=" MPI("+this.mpiBitLength+"b/"+this.mpiByteLength+"B) : 0x",a=a+util.hexstrdump(this.MPI);return a+"\n"};this.create=function(a){this.MPI=a;var b=8*(a.length-1),c;a:for(var d=a.charCodeAt(0),e=0;9>e;e++)if(0==d>>e){c=e;break a}this.mpiBitLength=b+c;this.mpiByteLength=a.length;return this};this.toBin=function(){var a=String.fromCharCode(this.mpiBitLength>>8&255),a=a+String.fromCharCode(this.mpiBitLength&255);return a+=this.MPI};this.getByteLength=function(){return this.mpiByteLength}}
|
||||
function openpgp_type_keyid(){this.read_packet=function(a,b){this.bytes=a.substring(b,b+8);return this};this.toString=function(){return util.hexstrdump(this.bytes)}}
|
||||
function openpgp_type_s2k(){this.read=function(a,b){var c=b;this.type=a[c++].charCodeAt();switch(this.type){case 0:this.hashAlgorithm=a[c++].charCodeAt();this.s2kLength=1;break;case 1:this.hashAlgorithm=a[c++].charCodeAt();this.saltValue=a.substring(c,c+8);this.s2kLength=9;break;case 3:this.hashAlgorithm=a[c++].charCodeAt();this.saltValue=a.substring(c,c+8);c+=8;this.EXPBIAS=6;c=a[c++].charCodeAt();this.count=16+(c&15)<<(c>>4)+this.EXPBIAS;this.s2kLength=10;break;default:util.print_error("unknown s2k type! "+
|
||||
this.type)}return this};this.produce_key=function(a){if(0==this.type)return openpgp_crypto_hashData(this.hashAlgorithm,a);if(1==this.type)return openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+a);if(3==this.type){for(var b=this.saltValue+a;b.length<this.count;)b+=this.saltValue+a;b.length>this.count&&(b=b.substr(0,this.count));return openpgp_crypto_hashData(this.hashAlgorithm,b)}return null}}
|
||||
this.type)}return this};this.write=function(a,b,c,d,e){this.type=a;if(3==this.type)this.saltValue=d,this.hashAlgorithm=b,this.count=16+(e&15)<<(e>>4)+6,this.s2kLength=10;return this.produce_key(c)};this.produce_key=function(a){if(0==this.type)return openpgp_crypto_hashData(this.hashAlgorithm,a);if(1==this.type)return openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+a);if(3==this.type){for(var b=this.saltValue+a;b.length<this.count;)b+=this.saltValue+a;b.length>this.count&&(b=b.substr(0,this.count));
|
||||
return openpgp_crypto_hashData(this.hashAlgorithm,b)}return null}}
|
||||
function openpgp_keyring(){this.init=function(){var a=JSON.parse(window.localStorage.getItem("privatekeys")),b=JSON.parse(window.localStorage.getItem("publickeys"));if(null==a||0==a.length)a=[];if(null==b||0==b.length)b=[];this.publicKeys=[];this.privateKeys=[];for(var c=0,d=0;d<a.length;d++){var e=openpgp.read_privateKey(a[d]);this.privateKeys[c]={armored:a[d],obj:e[0],keyId:e[0].getKeyId()};c++}for(d=c=0;d<b.length;d++)e=openpgp.read_publicKey(b[d]),null!=e[0]&&(this.publicKeys[c]={armored:b[d],
|
||||
obj:e[0],keyId:e[0].getKeyId()},c++)};this.hasPrivateKey=function(){return 0<this.privateKeys.length};this.store=function(){for(var a=[],b=0;b<this.privateKeys.length;b++)a[b]=this.privateKeys[b].armored;for(var c=[],b=0;b<this.publicKeys.length;b++)c[b]=this.publicKeys[b].armored;window.localStorage.setItem("privatekeys",JSON.stringify(a));window.localStorage.setItem("publickeys",JSON.stringify(c))};this.getPublicKeyForAddress=function(a){for(var b=[],c=a.split("<"),d="",d=1<c.length?c[1].split(">")[0]:
|
||||
a.trim(),a=0;a<this.publicKeys.length;a++)for(c=0;c<this.publicKeys[a].obj.userIds.length;c++)0<=this.publicKeys[a].obj.userIds[c].text.indexOf(d)&&(b[b.length]=this.publicKeys[a]);return b};this.getPrivateKeyForAddress=function(a){for(var b=[],c=a.split("<"),d="",d=1<c.length?c[1].split(">")[0]:a.trim(),a=0;a<this.privateKeys.length;a++)for(c=0;c<this.privateKeys[a].obj.userIds.length;c++)0<=this.privateKeys[a].obj.userIds[c].text.indexOf(d)&&(b[b.length]=this.privateKeys[a]);return b};this.getPublicKeysForKeyId=
|
||||
|
|
|
|||
|
|
@ -246,20 +246,23 @@ function normal_cfb_encrypt(blockcipherencryptfn, block_size, key, plaintext, iv
|
|||
var blocki ="";
|
||||
var blockc = "";
|
||||
var pos = 0;
|
||||
var cyphertext = "";
|
||||
blocki[i] = iv.substring(0,block_size);
|
||||
var cyphertext = [];
|
||||
var tempBlock = [];
|
||||
blockc = iv.substring(0,block_size);
|
||||
while (plaintext.length > block_size*pos) {
|
||||
blocka = plaintext.substring((pos*block_size),(pos*block_size)+block_size);
|
||||
var encblock = blockcipherencryptfn(blocki, key);
|
||||
for (var i=0; i < blocka.size; i++)
|
||||
blocki[i] = blocka ^ enblock();
|
||||
cyphertext += blocki;
|
||||
var encblock = blockcipherencryptfn(blockc, key);
|
||||
blocki = plaintext.substring((pos*block_size),(pos*block_size)+block_size);
|
||||
for (var i=0; i < blocki.length; i++)
|
||||
tempBlock.push(String.fromCharCode(blocki.charCodeAt(i) ^ encblock[i]));
|
||||
blockc = tempBlock.join('');
|
||||
tempBlock = [];
|
||||
cyphertext.push(blockc);
|
||||
pos++;
|
||||
}
|
||||
return cyphertext;
|
||||
return cyphertext.join('');
|
||||
}
|
||||
|
||||
function normal_cfb_decrypt(blockcipherencryptfn, block_size, key, ciphertext, iv) {
|
||||
function normal_cfb_decrypt(blockcipherencryptfn, block_size, key, ciphertext, iv) {
|
||||
var blockp ="";
|
||||
var pos = 0;
|
||||
var plaintext = [];
|
||||
|
|
|
|||
|
|
@ -473,15 +473,15 @@ function openpgp_crypto_testRSA(key){
|
|||
* @numBits [int] number of bits to make the key to be generated
|
||||
* @return {privateKey: [openpgp_packet_keymaterial] , publicKey: [openpgp_packet_keymaterial]}
|
||||
*/
|
||||
function openpgp_crypto_generateKeyPair(keyType, numBits){
|
||||
function openpgp_crypto_generateKeyPair(keyType, numBits, passphrase, s2kHash, symmetricEncryptionAlgorithm){
|
||||
var privKeyPacket;
|
||||
var publicKeyPacket;
|
||||
switch(keyType){
|
||||
case 1:
|
||||
var rsa = new RSA();
|
||||
var key = rsa.generate(numBits,"10001");
|
||||
privKeyPacket = new openpgp_packet_keymaterial().write_private_key(1, key);
|
||||
publicKeyPacket = new openpgp_packet_keymaterial().write_public_key(1, key);
|
||||
privKeyPacket = new openpgp_packet_keymaterial().write_private_key(keyType, key, passphrase, s2kHash, symmetricEncryptionAlgorithm);
|
||||
publicKeyPacket = new openpgp_packet_keymaterial().write_public_key(keyType, key);
|
||||
break;
|
||||
default:
|
||||
util.print_error("Unknown keytype "+keyType)
|
||||
|
|
|
|||
|
|
@ -357,13 +357,15 @@ function _openpgp () {
|
|||
* @userId [string] assumes already in form of "User Name <username@email.com>"
|
||||
* @return {privateKey: [openpgp_msg_privatekey], privateKeyArmored: [string], publicKeyArmored: [string]}
|
||||
*/
|
||||
function generate_key_pair(keyType, numBits, userId){
|
||||
function generate_key_pair(keyType, numBits, userId, passphrase){
|
||||
var userIdPacket = new openpgp_packet_userid();
|
||||
var userIdString = userIdPacket.write_packet(userId);
|
||||
|
||||
var keyPair = openpgp_crypto_generateKeyPair(keyType,numBits);
|
||||
var keyPair = openpgp_crypto_generateKeyPair(keyType,numBits, passphrase, openpgp.config.config.prefer_hash_algorithm, 3);
|
||||
var privKeyString = keyPair.privateKey;
|
||||
var privKeyPacket = new openpgp_packet_keymaterial().read_priv_key(privKeyString.string,3,privKeyString.string.length-3);
|
||||
var privKeyPacket = new openpgp_packet_keymaterial().read_priv_key(privKeyString.string,3,privKeyString.string.length);
|
||||
if(!privKeyPacket.decryptSecretMPIs(passphrase))
|
||||
util.print_error('Issue creating key. Unable to read resulting private key');
|
||||
var privKey = new openpgp_msg_privatekey();
|
||||
privKey.privateKeyPacket = privKeyPacket;
|
||||
privKey.getPreferredSignatureHashAlgorithm = function(){return openpgp.config.config.prefer_hash_algorithm};//need to override this to solve catch 22 to generate signature. 8 is value for SHA256
|
||||
|
|
|
|||
|
|
@ -414,6 +414,7 @@ function openpgp_packet_keymaterial() {
|
|||
}
|
||||
|
||||
var cleartextMPIslength = cleartextMPIs.length;
|
||||
|
||||
if (this.s2kUsageConventions == 254 &&
|
||||
str_sha1(cleartextMPIs.substring(0,cleartextMPIs.length - 20)) ==
|
||||
cleartextMPIs.substring(cleartextMPIs.length - 20)) {
|
||||
|
|
@ -678,7 +679,8 @@ function openpgp_packet_keymaterial() {
|
|||
* @param key [RSA.keyObject]
|
||||
* @return {body: [string]OpenPGP packet body contents, header: [string] OpenPGP packet header, string: [string] header+body}
|
||||
*/
|
||||
function write_private_key(keyType, key){
|
||||
function write_private_key(keyType, key, password, s2kHash, symmetricEncryptionAlgorithm){
|
||||
this.symmetricEncryptionAlgorithm = symmetricEncryptionAlgorithm;
|
||||
var tag = 5;
|
||||
var body = String.fromCharCode(4);
|
||||
//TODO make the date into a util function
|
||||
|
|
@ -687,25 +689,66 @@ function openpgp_packet_keymaterial() {
|
|||
body += String.fromCharCode(Math.floor(d/0x1000000%0x100)) + String.fromCharCode(Math.floor(d/0x10000%0x100)) + String.fromCharCode(Math.floor(d/0x100%0x100)) + String.fromCharCode(Math.floor(d%0x100));
|
||||
switch(keyType){
|
||||
case 1:
|
||||
body += String.fromCharCode(1);//public key algo
|
||||
body += String.fromCharCode(keyType);//public key algo
|
||||
body += key.n.toMPI();
|
||||
body += key.ee.toMPI();
|
||||
var algorithmStart = 6; //6 bits of extra info
|
||||
//below shows ske/s2k TODO: currently disabled (no pw)
|
||||
body += String.fromCharCode(0);//1 octet -- s2k, 0 for no s2k
|
||||
//TODO: if s2k == 255,254 then 1 octet symmetric encryption algo
|
||||
//TODO: if s2k == 255,254 then s2k specifier
|
||||
//TODO if s2k, IV of same length as cipher's block
|
||||
body += key.d.toMPI();
|
||||
body += key.p.toMPI();
|
||||
body += key.q.toMPI();
|
||||
body += key.u.toMPI();
|
||||
var algorithmStart = body.length;
|
||||
//below shows ske/s2k
|
||||
if(password){
|
||||
body += String.fromCharCode(254); //octet of 254 indicates s2k with SHA1
|
||||
//if s2k == 255,254 then 1 octet symmetric encryption algo
|
||||
body += String.fromCharCode(this.symmetricEncryptionAlgorithm);
|
||||
//if s2k == 255,254 then s2k specifier
|
||||
body += String.fromCharCode(3); //s2k salt+iter
|
||||
body += String.fromCharCode(s2kHash);
|
||||
//8 octet salt value
|
||||
//1 octet count
|
||||
var cleartextMPIs = key.d.toMPI() + key.p.toMPI() + key.q.toMPI() + key.u.toMPI();
|
||||
var sha1Hash = str_sha1(cleartextMPIs);
|
||||
util.print_debug_hexstr_dump('write_private_key sha1: ',sha1Hash);
|
||||
var salt = openpgp_crypto_getRandomBytes(8);
|
||||
util.print_debug_hexstr_dump('write_private_key Salt: ',salt);
|
||||
body += salt;
|
||||
var c = openpgp_crypto_getSecureRandomOctet();
|
||||
body += String.fromCharCode(c);
|
||||
util.print_debug('write_private_key c: '+ c);
|
||||
var s2k = new openpgp_type_s2k();
|
||||
var hashKey = s2k.write(3, s2kHash, password, salt, c);
|
||||
//if s2k, IV of same length as cipher's block
|
||||
switch(this.symmetricEncryptionAlgorithm){
|
||||
case 3:
|
||||
this.IVLength = 8;
|
||||
this.IV = openpgp_crypto_getRandomBytes(this.IVLength);
|
||||
ciphertextMPIs = normal_cfb_encrypt(function(block, key) {
|
||||
var cast5 = new openpgp_symenc_cast5();
|
||||
cast5.setKey(key);
|
||||
return cast5.encrypt(util.str2bin(block));
|
||||
}, this.IVLength, util.str2bin(hashKey.substring(0,16)), cleartextMPIs + sha1Hash, this.IV);
|
||||
body += this.IV + ciphertextMPIs;
|
||||
break;
|
||||
case 7:
|
||||
case 8:
|
||||
case 9:
|
||||
this.IVLength = 16;
|
||||
this.IV = openpgp_crypto_getRandomBytes(this.IVLength);
|
||||
ciphertextMPIs = normal_cfb_encrypt(AESencrypt,
|
||||
this.IVLength, hashKey, cleartextMPIs + sha1Hash, this.IV);
|
||||
body += this.IV + ciphertextMPIs;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else{
|
||||
body += String.fromCharCode(0);//1 octet -- s2k, 0 for no s2k
|
||||
body += key.d.toMPI() + key.p.toMPI() + key.q.toMPI() + key.u.toMPI();
|
||||
var checksum = util.calc_checksum(key.d.toMPI() + key.p.toMPI() + key.q.toMPI() + key.u.toMPI());
|
||||
body += String.fromCharCode(checksum/0x100) + String.fromCharCode(checksum%0x100);//DEPRECATED:s2k == 0, 255: 2 octet checksum, sum all octets%65536
|
||||
util.print_debug_hexstr_dump('write_private_key basic checksum: '+ checksum);
|
||||
}
|
||||
break;
|
||||
default :
|
||||
body = "";
|
||||
util.print_error("openpgp.packet.keymaterial.js\n"+'error writing private key, unknown type :'+keyType);
|
||||
}
|
||||
body += util.calc_checksum(body.substr(algorithmStart));//DEPRECATED:s2k == 0, 255: 2 octet checksum, sum all octets%65536
|
||||
var header = openpgp_packet.write_packet_header(tag,body.length);
|
||||
return {string: header+body , header: header, body: body};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,21 @@ function openpgp_type_s2k() {
|
|||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* writes an s2k hash based on the inputs.
|
||||
* @return [String] produced key of hashAlgorithm hash length
|
||||
*/
|
||||
function write(type, hash, passphrase, salt, c){
|
||||
this.type = type;
|
||||
if(this.type == 3){this.saltValue = salt;
|
||||
this.hashAlgorithm = hash;
|
||||
this.count = (16 + (c & 15)) << ((c >> 4) + 6);
|
||||
this.s2kLength = 10;
|
||||
}
|
||||
return this.produce_key(passphrase);
|
||||
}
|
||||
|
||||
/**
|
||||
* produces a key using the specified passphrase and the defined hashAlgorithm
|
||||
|
|
@ -94,5 +109,6 @@ function openpgp_type_s2k() {
|
|||
}
|
||||
|
||||
this.read = read;
|
||||
this.write = write;
|
||||
this.produce_key = produce_key;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user