From 909d41a9ff831d6dad6ad9a256181fd7b9e5cdce Mon Sep 17 00:00:00 2001
From: Sean Colyer <sean@colyer.name>
Date: Sun, 15 Apr 2012 23:01:10 -0400
Subject: [PATCH] s2k optimization for large iter values in type 3 s2k.

---
 resources/openpgp.js         | 8 +++++---
 resources/openpgp.min.js     | 8 ++++----
 src/type/openpgp.type.s2k.js | 8 +++++---
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/resources/openpgp.js b/resources/openpgp.js
index 04b1b7d7..8f465382 100644
--- a/resources/openpgp.js
+++ b/resources/openpgp.js
@@ -11302,9 +11302,11 @@ function openpgp_type_s2k() {
 		} else if (this.type == 1) {
 			return openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+passphrase);
 		} else if (this.type == 3) {
-			var isp = this.saltValue+passphrase;
-			while (isp.length < this.count)
-				isp += this.saltValue+passphrase; 			
+			var isp = [];
+			isp[0] = this.saltValue+passphrase;
+			while (isp.length*(this.saltValue+passphrase).length < this.count)
+				isp.push(this.saltValue+passphrase);
+			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.
diff --git a/resources/openpgp.min.js b/resources/openpgp.min.js
index 3a205c59..63321baf 100644
--- a/resources/openpgp.min.js
+++ b/resources/openpgp.min.js
@@ -24,12 +24,12 @@ a),null;var e=a;this.packetLength=d;this.version=b[e++].charCodeAt();switch(this
 b[e++].charCodeAt();this.hashAlgorithm=b[e++].charCodeAt();this.signedHashValue=b[e++].charCodeAt()<<8|b[e++].charCodeAt();d=0;0<this.publicKeyAlgorithm&&4>this.publicKeyAlgorithm?d=1:17==this.publicKeyAlgorithm&&(d=2);this.MPIs=[];for(var f=0;f<d;f++)this.MPIs[f]=new openpgp_type_mpi,null!=this.MPIs[f].read(b,e,e-a)&&!this.packetLength<e-a?e+=this.MPIs[f].packetLength:util.print_error("signature contains invalid MPI @:"+e);break;case 4:this.signatureType=b[e++].charCodeAt();this.publicKeyAlgorithm=
 b[e++].charCodeAt();this.hashAlgorithm=b[e++].charCodeAt();f=(b[e++].charCodeAt()<<8)+b[e++].charCodeAt();for(d=0;f!=d;)f<d&&util.print_debug("openpgp.packet.signature.js\nhashed missed something: "+e+" c:"+f+" l:"+d),d+=this._raw_read_signature_sub_packet(b,e+d,f-d);e+=f;this.signatureData=b.substring(a,e);f=(b[e++].charCodeAt()<<8)+b[e++].charCodeAt();for(d=0;f!=d;)f<d&&util.print_debug("openpgp.packet.signature.js\nmissed something: "+d+" c:"+f+"  l:"+d),d+=this._raw_read_signature_sub_packet(b,
 e+d,f-d);e+=f;this.signedHashValue=b[e++].charCodeAt()<<8|b[e++].charCodeAt();d=0;0<this.publicKeyAlgorithm&&4>this.publicKeyAlgorithm?d=1:17==this.publicKeyAlgorithm&&(d=2);this.MPIs=[];for(f=0;f<d;f++)this.MPIs[f]=new openpgp_type_mpi,null!=this.MPIs[f].read(b,e,e-a)&&!this.packetLength<e-a?e+=this.MPIs[f].packetLength:util.print_error("signature contains invalid MPI @:"+e);break;default:util.print_error("openpgp.packet.signature.js\nunknown signature packet version"+this.version)}return this};
-this.toString=function(){for(var b=3==this.version?"5.2. Signature Packet (Tag 2)\nPacket Length:                     :"+this.packetLength+"\nPacket version:                    :"+this.version+"\nOne-octet signature type           :"+this.signatureType+"\nFour-octet creation time.          :"+this.creationTime+"\nEight-octet Key ID of signer.       :"+util.hexidump(this.keyId)+"\nOne-octet public-key algorithm.    :"+this.publicKeyAlgorithm+"\nOne-octet hash algorithm.          :"+this.hashAlgorithm+
+this.toString=function(){for(var a=3==this.version?"5.2. Signature Packet (Tag 2)\nPacket Length:                     :"+this.packetLength+"\nPacket version:                    :"+this.version+"\nOne-octet signature type           :"+this.signatureType+"\nFour-octet creation time.          :"+this.creationTime+"\nEight-octet Key ID of signer.       :"+util.hexidump(this.keyId)+"\nOne-octet public-key algorithm.    :"+this.publicKeyAlgorithm+"\nOne-octet hash algorithm.          :"+this.hashAlgorithm+
 "\nTwo-octet field holding left\n 16 bits of signed hash value.     :"+this.signedHashValue+"\n":"5.2. Signature Packet (Tag 2)\nPacket Length:                     :"+this.packetLength+"\nPacket version:                    :"+this.version+"\nOne-octet signature type           :"+this.signatureType+"\nOne-octet public-key algorithm.    :"+this.publicKeyAlgorithm+"\nOne-octet hash algorithm.          :"+this.hashAlgorithm+"\nTwo-octet field holding left\n 16 bits of signed hash value.     :"+this.signedHashValue+
 "\nSignature Creation Time            :"+this.creationTime+"\nSignature Expiration Time          :"+this.signatureExpirationTime+"\nSignature Never Expires            :"+this.signatureNeverExpires+"\nExportable Certification           :"+this.exportable+"\nTrust Signature level:             :"+this.trustLevel+" amount"+this.trustAmount+"\nRegular Expression                 :"+this.regular_expression+"\nRevocable                          :"+this.revocable+"\nKey Expiration Time                :"+this.keyExpirationTime+
 " "+this.keyNeverExpires+"\nPreferred Symmetric Algorithms     :"+this.preferredSymmetricAlgorithms+"\nRevocation Key\n   ( 1 octet of class,             :"+this.revocationKeyClass+"\n     1 octet of public-key ID,     :"+this.revocationKeyAlgorithm+"\n    20 octets of fingerprint)      :"+this.revocationKeyFingerprint+"\nIssuer                             :"+util.hexstrdump(this.issuerKeyId)+"\nPreferred Hash Algorithms          :"+this.preferredHashAlgorithms+"\nPreferred Compression Alg.         :"+
 this.preferredCompressionAlgorithms+"\nKey Server Preferences             :"+this.keyServerPreferences+"\nPreferred Key Server               :"+this.preferredKeyServer+"\nPrimary User ID                    :"+this.isPrimaryUserID+"\nPolicy URI                         :"+this.policyURI+"\nKey Flags                          :"+this.keyFlags+"\nSigner's User ID                   :"+this.signersUserId+"\nNotation                           :"+this.notationName+" = "+this.notationValue+"\nReason for Revocation\n      Flag                         :"+
-this.reasonForRevocationFlag+"\n      Reason                       :"+this.reasonForRevocationString+"\nMPI:\n",a=0;a<this.MPIs.length;a++)b+=this.MPIs[a].toString();return b}}
+this.reasonForRevocationFlag+"\n      Reason                       :"+this.reasonForRevocationString+"\nMPI:\n",c=0;c<this.MPIs.length;c++)a+=this.MPIs[c].toString();return a}}
 function openpgp_packet_encryptedintegrityprotecteddata(){this.tagType=18;this.hash=this.decrytpedData=this.encryptedData=this.packetLength=this.version=null;this.write_packet=function(a,b,c){var d=openpgp_crypto_getPrefixRandom(a),e=d+d.charAt(d.length-2)+d.charAt(d.length-1),c=c+String.fromCharCode(211),c=c+String.fromCharCode(20);util.print_debug_hexstr_dump("data to be hashed:",e+c);c+=str_sha1(e+c);util.print_debug_hexstr_dump("hash:",c.substring(c.length-20,c.length));a=openpgp_crypto_symmetricEncrypt(d,
 a,b,c,!1).substring(0,e.length+c.length);b=openpgp_packet.write_packet_header(18,a.length+1)+String.fromCharCode(1);this.encryptedData=a;return b+a};this.read_packet=function(a,b,c){this.packetLength=c;this.version=a[b].charCodeAt();if(1!=this.version)return util.print_error("openpgp.packet.encryptedintegrityprotecteddata.js\nunknown encrypted integrity protected data packet version: "+this.version+" , @ "+b+"hex:"+util.hexstrdump(a)),null;this.encryptedData=a.substring(b+1,b+1+c);util.print_debug("openpgp.packet.encryptedintegrityprotecteddata.js\n"+
 this.toString());return this};this.toString=function(){var a="";openpgp.config.debug&&(a="    data: Bytes ["+util.hexstrdump(this.encryptedData)+"]");return"5.13.  Sym. Encrypted Integrity Protected Data Packet (Tag 18)\n    length:  "+this.packetLength+"\n    version: "+this.version+"\n"+a};this.decrypt=function(a,b){this.decryptedData=openpgp_crypto_symmetricDecrypt(a,b,this.encryptedData,!1);this.hash=str_sha1(openpgp_crypto_MDCSystemBytes(a,b,this.encryptedData)+this.decryptedData.substring(0,
@@ -430,8 +430,8 @@ function openpgp_type_mpi(){this.data=this.mpiByteLength=this.mpiBitLength=this.
 16)};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.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,b){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 c=this.saltValue+a;c.length<this.count;)c+=this.saltValue+a;c.length>this.count&&(c=c.substr(0,
-this.count));return b&&(24==b||32==b)?openpgp_crypto_hashData(this.hashAlgorithm,c)+openpgp_crypto_hashData(this.hashAlgorithm,String.fromCharCode(0)+c):openpgp_crypto_hashData(this.hashAlgorithm,c)}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,b){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){var c=[];for(c[0]=this.saltValue+a;c.length*(this.saltValue+a).length<this.count;)c.push(this.saltValue+
+a);c=c.join("");c.length>this.count&&(c=c.substr(0,this.count));return b&&(24==b||32==b)?openpgp_crypto_hashData(this.hashAlgorithm,c)+openpgp_crypto_hashData(this.hashAlgorithm,String.fromCharCode(0)+c):openpgp_crypto_hashData(this.hashAlgorithm,c)}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=
diff --git a/src/type/openpgp.type.s2k.js b/src/type/openpgp.type.s2k.js
index 845916e9..af1d9fad 100644
--- a/src/type/openpgp.type.s2k.js
+++ b/src/type/openpgp.type.s2k.js
@@ -99,9 +99,11 @@ function openpgp_type_s2k() {
 		} else if (this.type == 1) {
 			return openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+passphrase);
 		} else if (this.type == 3) {
-			var isp = this.saltValue+passphrase;
-			while (isp.length < this.count)
-				isp += this.saltValue+passphrase; 			
+			var isp = [];
+			isp[0] = this.saltValue+passphrase;
+			while (isp.length*(this.saltValue+passphrase).length < this.count)
+				isp.push(this.saltValue+passphrase);
+			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.