Mirroristas/openpgpjs
2
0
Fork 0
mirror of https://github.com/openpgpjs/openpgpjs.git synced 2026-03-03 16:00:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sym encrypted session key is working, decryption of messages

Browse Source 
from gpg works too! Fixed some minor bugs and got rid of a
few globals.
This commit is contained in:
Michal Kolodziej
2013-04-23 10:03:28 +02:00
parent 3a3764a436
commit 38330ea4a6
11 changed files with 378 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/type/openpgp.type.s2k.js
View File

@@ -88,6 +88,7 @@ function openpgp_type_s2k() {
util.print_error("unknown s2k type! "+this.type);
break;
}
this.packetLength = mypos - position;
return this;
}
@@ -115,10 +116,12 @@ function openpgp_type_s2k() {
*/
function produce_key(passphrase, numBytes) {
passphrase = util.encode_utf8(passphrase);
var result;
if (this.type == 0) {
return openpgp_crypto_hashData(this.hashAlgorithm,passphrase);
result = openpgp_crypto_hashData(this.hashAlgorithm,passphrase);
} else if (this.type == 1) {
return openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+passphrase);
result = openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+passphrase);
} else if (this.type == 3) {
var isp = [];
isp[0] = this.saltValue+passphrase;
@@ -127,12 +130,19 @@ function openpgp_type_s2k() {
isp = isp.join('');
if (isp.length > this.count)
isp = isp.substr(0, this.count);
if(numBytes && (numBytes == 24 || numBytes == 32)){ //This if accounts for RFC 4880 3.7.1.1 -- If hash size is greater than block size, use leftmost bits. If blocksize larger than hash size, we need to rehash isp and prepend with 0.
if(numBytes && (numBytes == 24 || numBytes == 32)){
//This if accounts for RFC 4880 3.7.1.1 -- If hash size is
//greater than block size, use leftmost bits. If blocksize
//larger than hash size, we need to rehash isp and prepend with 0.
var key = openpgp_crypto_hashData(this.hashAlgorithm,isp);
return key + openpgp_crypto_hashData(this.hashAlgorithm,String.fromCharCode(0)+isp);
result = key + openpgp_crypto_hashData(this.hashAlgorithm,
String.fromCharCode(0)+isp);
}
return openpgp_crypto_hashData(this.hashAlgorithm,isp);
else result = openpgp_crypto_hashData(this.hashAlgorithm,isp);
} else return null;
return result.substr(0, numBytes);
}
this.read = read;