Merge pull request #54 from seancolyer/master
Fix for dynamic packet header lengths, prevent jsxcompressor from endless loop in certain situations.
This commit is contained in:
Sean Colyer
commit
15e5705a83
|
|
@ -2219,7 +2219,6 @@ function _openpgp_packet() {
|
|||
mypos++;
|
||||
|
||||
// parsed length from length field
|
||||
var len = 0;
|
||||
var bodydata = null;
|
||||
|
||||
// used for partial body lengths
|
||||
|
|
@ -2254,6 +2253,8 @@ function _openpgp_packet() {
|
|||
// definite length, or a new format header. The new format
|
||||
// headers described below have a mechanism for precisely
|
||||
// encoding data of indeterminate length.
|
||||
packet_length = len;
|
||||
break;
|
||||
}
|
||||
|
||||
} else // 4.2.2. New Format Packet Lengths
|
||||
|
|
@ -2571,9 +2572,13 @@ function openpgp_packet_compressed() {
|
|||
var radix = s2r(compData).replace(/\n/g,"");
|
||||
var outputString = JXG.decompress(radix);
|
||||
//TODO check ADLER32 checksum
|
||||
var packet = openpgp_packet.read_packet(outputString, 0, outputString.length);
|
||||
util.print_info('Decompressed packet [Type 2-ZLIB]: ' + packet);
|
||||
this.decompressedData = packet.data;
|
||||
var dearmored = {type: 3, text: outputString, openpgp: outputString};
|
||||
var messages = openpgp.read_messages_dearmored(dearmored);
|
||||
for(var m in messages){
|
||||
if(messages[m].data){
|
||||
this.decompressedData = messages[m].data;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
util.print_error("Compression algorithm ZLIB only supports DEFLATE compression method.");
|
||||
}
|
||||
|
|
@ -9684,13 +9689,20 @@ function _openpgp () {
|
|||
util.print_error('no message found!');
|
||||
return null;
|
||||
}
|
||||
var input = dearmored.openpgp;
|
||||
return read_messages_dearmored(dearmored);
|
||||
}
|
||||
|
||||
function read_messages_dearmored(input){
|
||||
var messageString = input.openpgp;
|
||||
var messages = new Array();
|
||||
var messageCount = 0;
|
||||
var mypos = 0;
|
||||
var l = input.length;
|
||||
while (mypos < input.length) {
|
||||
var first_packet = openpgp_packet.read_packet(input, mypos, l);
|
||||
var l = messageString.length;
|
||||
while (mypos < messageString.length) {
|
||||
var first_packet = openpgp_packet.read_packet(messageString, mypos, l);
|
||||
if (!first_packet) {
|
||||
break;
|
||||
}
|
||||
// public key parser (definition from the standard:)
|
||||
// OpenPGP Message :- Encrypted Message | Signed Message |
|
||||
// Compressed Message | Literal Message.
|
||||
|
|
@ -9716,6 +9728,7 @@ function _openpgp () {
|
|||
if (first_packet.tagType == 1 ||
|
||||
(first_packet.tagType == 2 && first_packet.signatureType < 16) ||
|
||||
first_packet.tagType == 3 ||
|
||||
first_packet.tagType == 4 ||
|
||||
first_packet.tagType == 8 ||
|
||||
first_packet.tagType == 9 ||
|
||||
first_packet.tagType == 10 ||
|
||||
|
|
@ -9724,7 +9737,7 @@ function _openpgp () {
|
|||
first_packet.tagType == 19) {
|
||||
messages[messages.length] = new openpgp_msg_message();
|
||||
messages[messageCount].messagePacket = first_packet;
|
||||
messages[messageCount].type = dearmored.type;
|
||||
messages[messageCount].type = input.type;
|
||||
// Encrypted Message
|
||||
if (first_packet.tagType == 9 ||
|
||||
first_packet.tagType == 1 ||
|
||||
|
|
@ -9742,7 +9755,7 @@ function _openpgp () {
|
|||
messages[messageCount].sessionKeys[sessionKeyCount] = first_packet;
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
first_packet = openpgp_packet.read_packet(input, mypos, l);
|
||||
first_packet = openpgp_packet.read_packet(messageString, mypos, l);
|
||||
|
||||
if (first_packet.tagType != 1 && first_packet.tagType != 3)
|
||||
issessionkey = false;
|
||||
|
|
@ -9766,12 +9779,19 @@ function _openpgp () {
|
|||
} else
|
||||
// Signed Message
|
||||
if (first_packet.tagType == 2 && first_packet.signatureType < 3) {
|
||||
messages[messageCount].text = dearmored.text;
|
||||
messages[messageCount].text = input.text;
|
||||
messages[messageCount].signature = first_packet;
|
||||
break;
|
||||
} else
|
||||
// Signed Message
|
||||
if (first_packet.tagType == 4) {
|
||||
//TODO: Implement check
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
} else
|
||||
// Compressed Message
|
||||
// TODO: needs to be implemented. From a security perspective: this message is plaintext anyway.
|
||||
// This has been implemented as part of processing. Check openpgp.packet.
|
||||
if (first_packet.tagType == 8) {
|
||||
util.print_error("A directly compressed message is currently not supported");
|
||||
break;
|
||||
|
|
@ -9784,12 +9804,13 @@ function _openpgp () {
|
|||
// continue with next packet
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
} else
|
||||
// Literal Message
|
||||
// TODO: needs to be implemented. From a security perspective: this message is plaintext anyway.
|
||||
} else
|
||||
if (first_packet.tagType == 11) {
|
||||
util.print_error("A direct literal message is currently not supported.");
|
||||
break;
|
||||
// Literal Message -- work is already done in read_packet
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
messages[messageCount].data = first_packet.data;
|
||||
messageCount++;
|
||||
}
|
||||
} else {
|
||||
util.print_error('no message found!');
|
||||
|
|
@ -9954,6 +9975,7 @@ function _openpgp () {
|
|||
this.write_signed_and_encrypted_message = write_signed_and_encrypted_message;
|
||||
this.write_encrypted_message = write_encrypted_message;
|
||||
this.read_message = read_message;
|
||||
this.read_messages_dearmored = read_messages_dearmored;
|
||||
this.read_publicKey = read_publicKey;
|
||||
this.read_privateKey = read_privateKey;
|
||||
this.init = init;
|
||||
|
|
@ -10265,7 +10287,7 @@ function openpgp_config() {
|
|||
keyserver: "keyserver.linux.it" // "pgp.mit.edu:11371"
|
||||
};
|
||||
|
||||
this.versionstring ="OpenPGP.js v.1.20120911";
|
||||
this.versionstring ="OpenPGP.js v.1.20121006";
|
||||
this.commentstring ="http://openpgpjs.org";
|
||||
/**
|
||||
* reads the config out of the HTML5 local storage
|
||||
|
|
@ -11525,6 +11547,7 @@ JXG.Util.Unzip = function (barray){
|
|||
}
|
||||
if (debug)
|
||||
document.write("<br>literalTree");
|
||||
outer:
|
||||
while(1) {
|
||||
j = DecodeValue(literalTree);
|
||||
if(j >= 256) { // In C64: if carry set
|
||||
|
|
@ -11546,6 +11569,9 @@ JXG.Util.Unzip = function (barray){
|
|||
}
|
||||
dist += cpdist[j];
|
||||
while(len--) {
|
||||
if(bIdx - dist < 0) {
|
||||
break outer;
|
||||
}
|
||||
var c = buf32k[(bIdx - dist) & 0x7fff];
|
||||
addBuffer(c);
|
||||
}
|
||||
|
|
|
|||
73
resources/openpgp.min.js
vendored
73
resources/openpgp.min.js
vendored
|
|
@ -62,20 +62,20 @@ function openpgp_packet_userattribute(){this.tagType=17;this.certificationSignat
|
|||
e+" l:"+f);break}else switch(g.tagType){case 2:15<g.signatureType&&20>g.signatureType?this.certificationSignatures[this.certificationSignatures.length]=g:32==g.signatureType&&(this.certificationRevocationSignatures[this.certificationRevocationSignatures.length]=g);e+=g.packetLength+g.headerLength;f=d-(e-c);break;default:return this.data=a,this.position=c-b.packetLength,this.len=e-c}}this.data=a;this.position=c-b.packetLength;return this.len=e-c};this.toString=function(){for(var b="5.12. User Attribute Packet (Tag 17)\n AttributePackets: (count = "+
|
||||
this.userattributes.length+")\n",a=0;a<this.userattributes.length;a++)b+=" ("+this.userattributes[a].length+") bytes: ["+util.hexidump(this.userattributes[a])+"]\n";return b}}
|
||||
function _openpgp_packet(){function b(a){result="";192>a?result+=String.fromCharCode(a):191<a&&8384>a?(result+=String.fromCharCode((a-192>>8)+192),result+=String.fromCharCode(a-192&255)):(result+=String.fromCharCode(255),result+=String.fromCharCode(a>>24&255),result+=String.fromCharCode(a>>16&255),result+=String.fromCharCode(a>>8&255),result+=String.fromCharCode(a&255));return result}this.encode_length=b;this.write_old_packet_header=function(a,b){var d="";256>b?(d+=String.fromCharCode(128|a<<2),d+=
|
||||
String.fromCharCode(b)):(65536>b?(d+=String.fromCharCode(a<<2|129),d+=String.fromCharCode(b>>8)):(d+=String.fromCharCode(a<<2|130),d+=String.fromCharCode(b>>24&255),d+=String.fromCharCode(b>>16&255),d+=String.fromCharCode(b>>8&255)),d+=String.fromCharCode(b&255));return d};this.write_packet_header=function(a,c){var d;d=""+String.fromCharCode(192|a);return d+=b(c)};this.read_packet=function(a,b){if(null==a||a.length<=b||2>a.substring(b).length||0==(a[b].charCodeAt()&128))return util.print_error("Error during parsing. This message / key is propably not containing a valid OpenPGP format."),
|
||||
null;var d=b,e=-1,f=-1,f=0;0!=(a[d].charCodeAt()&64)&&(f=1);var g;f?e=a[d].charCodeAt()&63:(e=(a[d].charCodeAt()&63)>>2,g=a[d].charCodeAt()&3);d++;var h=null,k=-1;if(f)if(192>a[d].charCodeAt())packet_length=a[d++].charCodeAt(),util.print_debug("1 byte length:"+packet_length);else if(192<=a[d].charCodeAt()&&224>a[d].charCodeAt())packet_length=(a[d++].charCodeAt()-192<<8)+a[d++].charCodeAt()+192,util.print_debug("2 byte length:"+packet_length);else if(223<a[d].charCodeAt()&&255>a[d].charCodeAt()){packet_length=
|
||||
1<<(a[d++].charCodeAt()&31);util.print_debug("4 byte length:"+packet_length);k=d+packet_length;for(h=a.substring(d,d+packet_length);;)if(192>a[k].charCodeAt()){f=a[k++].charCodeAt();packet_length+=f;h+=a.substring(k,k+f);k+=f;break}else if(192<=a[k].charCodeAt()&&224>a[k].charCodeAt()){f=(a[k++].charCodeAt()-192<<8)+a[k++].charCodeAt()+192;packet_length+=f;h+=a.substring(k,k+f);k+=f;break}else if(223<a[k].charCodeAt()&&255>a[k].charCodeAt())f=1<<(a[k++].charCodeAt()&31),packet_length+=f,h+=a.substring(k,
|
||||
k+f),k+=f;else{k++;f=a[k++].charCodeAt()<<24|a[k++].charCodeAt()<<16|a[k++].charCodeAt()<<8|a[k++].charCodeAt();h+=a.substring(k,k+f);packet_length+=f;k+=f;break}}else d++,packet_length=a[d++].charCodeAt()<<24|a[d++].charCodeAt()<<16|a[d++].charCodeAt()<<8|a[d++].charCodeAt();else switch(g){case 0:packet_length=a[d++].charCodeAt();break;case 1:packet_length=a[d++].charCodeAt()<<8|a[d++].charCodeAt();break;case 2:packet_length=a[d++].charCodeAt()<<24|a[d++].charCodeAt()<<16|a[d++].charCodeAt()<<8|
|
||||
a[d++].charCodeAt()}-1==k&&(k=packet_length);null==h&&(h=a.substring(d,d+k));switch(e){case 0:break;case 1:e=new openpgp_packet_encryptedsessionkey;if(null!=e.read_pub_key_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 2:e=new openpgp_packet_signature;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 3:e=new openpgp_packet_encryptedsessionkey;if(null!=e.read_symmetric_key_packet(h,0,packet_length))return e.headerLength=
|
||||
d-b,e.packetLength=k,e;break;case 4:e=new openpgp_packet_onepasssignature;if(e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 5:e=new openpgp_packet_keymaterial;e.header=a.substring(b,d);if(null!=e.read_tag5(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 6:e=new openpgp_packet_keymaterial;e.header=a.substring(b,d);if(null!=e.read_tag6(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 7:e=new openpgp_packet_keymaterial;
|
||||
if(null!=e.read_tag7(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 8:e=new openpgp_packet_compressed;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 9:e=new openpgp_packet_encrypteddata;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 10:e=new openpgp_packet_marker;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 11:e=new openpgp_packet_literaldata;
|
||||
if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.header=a.substring(b,d),e.packetLength=k,e;break;case 12:break;case 13:e=new openpgp_packet_userid;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 14:e=new openpgp_packet_keymaterial;e.header=a.substring(b,d);if(null!=e.read_tag14(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 17:e=new openpgp_packet_userattribute;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=
|
||||
d-b,e.packetLength=k,e;break;case 18:e=new openpgp_packet_encryptedintegrityprotecteddata;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;case 19:e=new openpgp_packet_modificationdetectioncode;if(null!=e.read_packet(h,0,packet_length))return e.headerLength=d-b,e.packetLength=k,e;break;default:return util.print_error("openpgp.packet.js\n[ERROR] openpgp_packet: failed to parse packet @:"+d+"\nchar:'"+util.hexstrdump(a.substring(d))+"'\ninput:"+util.hexstrdump(a)),
|
||||
String.fromCharCode(b)):(65536>b?(d+=String.fromCharCode(a<<2|129),d+=String.fromCharCode(b>>8)):(d+=String.fromCharCode(a<<2|130),d+=String.fromCharCode(b>>24&255),d+=String.fromCharCode(b>>16&255),d+=String.fromCharCode(b>>8&255)),d+=String.fromCharCode(b&255));return d};this.write_packet_header=function(a,c){var d;d=""+String.fromCharCode(192|a);return d+=b(c)};this.read_packet=function(a,b,d){if(null==a||a.length<=b||2>a.substring(b).length||0==(a[b].charCodeAt()&128))return util.print_error("Error during parsing. This message / key is propably not containing a valid OpenPGP format."),
|
||||
null;var e=b,f=-1,g=-1,g=0;0!=(a[e].charCodeAt()&64)&&(g=1);var h;g?f=a[e].charCodeAt()&63:(f=(a[e].charCodeAt()&63)>>2,h=a[e].charCodeAt()&3);e++;var k=null,j=-1;if(g)if(192>a[e].charCodeAt())packet_length=a[e++].charCodeAt(),util.print_debug("1 byte length:"+packet_length);else if(192<=a[e].charCodeAt()&&224>a[e].charCodeAt())packet_length=(a[e++].charCodeAt()-192<<8)+a[e++].charCodeAt()+192,util.print_debug("2 byte length:"+packet_length);else if(223<a[e].charCodeAt()&&255>a[e].charCodeAt()){packet_length=
|
||||
1<<(a[e++].charCodeAt()&31);util.print_debug("4 byte length:"+packet_length);j=e+packet_length;for(k=a.substring(e,e+packet_length);;)if(192>a[j].charCodeAt()){d=a[j++].charCodeAt();packet_length+=d;k+=a.substring(j,j+d);j+=d;break}else if(192<=a[j].charCodeAt()&&224>a[j].charCodeAt()){d=(a[j++].charCodeAt()-192<<8)+a[j++].charCodeAt()+192;packet_length+=d;k+=a.substring(j,j+d);j+=d;break}else if(223<a[j].charCodeAt()&&255>a[j].charCodeAt())d=1<<(a[j++].charCodeAt()&31),packet_length+=d,k+=a.substring(j,
|
||||
j+d),j+=d;else{j++;d=a[j++].charCodeAt()<<24|a[j++].charCodeAt()<<16|a[j++].charCodeAt()<<8|a[j++].charCodeAt();k+=a.substring(j,j+d);packet_length+=d;j+=d;break}}else e++,packet_length=a[e++].charCodeAt()<<24|a[e++].charCodeAt()<<16|a[e++].charCodeAt()<<8|a[e++].charCodeAt();else switch(h){case 0:packet_length=a[e++].charCodeAt();break;case 1:packet_length=a[e++].charCodeAt()<<8|a[e++].charCodeAt();break;case 2:packet_length=a[e++].charCodeAt()<<24|a[e++].charCodeAt()<<16|a[e++].charCodeAt()<<8|
|
||||
a[e++].charCodeAt();break;default:packet_length=d}-1==j&&(j=packet_length);null==k&&(k=a.substring(e,e+j));switch(f){case 0:break;case 1:f=new openpgp_packet_encryptedsessionkey;if(null!=f.read_pub_key_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 2:f=new openpgp_packet_signature;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 3:f=new openpgp_packet_encryptedsessionkey;if(null!=f.read_symmetric_key_packet(k,0,packet_length))return f.headerLength=
|
||||
e-b,f.packetLength=j,f;break;case 4:f=new openpgp_packet_onepasssignature;if(f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 5:f=new openpgp_packet_keymaterial;f.header=a.substring(b,e);if(null!=f.read_tag5(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 6:f=new openpgp_packet_keymaterial;f.header=a.substring(b,e);if(null!=f.read_tag6(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 7:f=new openpgp_packet_keymaterial;
|
||||
if(null!=f.read_tag7(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 8:f=new openpgp_packet_compressed;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 9:f=new openpgp_packet_encrypteddata;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 10:f=new openpgp_packet_marker;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 11:f=new openpgp_packet_literaldata;
|
||||
if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.header=a.substring(b,e),f.packetLength=j,f;break;case 12:break;case 13:f=new openpgp_packet_userid;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 14:f=new openpgp_packet_keymaterial;f.header=a.substring(b,e);if(null!=f.read_tag14(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 17:f=new openpgp_packet_userattribute;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=
|
||||
e-b,f.packetLength=j,f;break;case 18:f=new openpgp_packet_encryptedintegrityprotecteddata;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;case 19:f=new openpgp_packet_modificationdetectioncode;if(null!=f.read_packet(k,0,packet_length))return f.headerLength=e-b,f.packetLength=j,f;break;default:return util.print_error("openpgp.packet.js\n[ERROR] openpgp_packet: failed to parse packet @:"+e+"\nchar:'"+util.hexstrdump(a.substring(e))+"'\ninput:"+util.hexstrdump(a)),
|
||||
null}}}var openpgp_packet=new _openpgp_packet;
|
||||
function openpgp_packet_compressed(){this.tagType=8;this.read_packet=function(b,a,c){this.packetLength=c;var d=a;this.type=b.charCodeAt(d++);this.compressedData=b.substring(a+1,a+c);return this};this.toString=function(){return"5.6. Compressed Data Packet (Tag 8)\n length: "+this.packetLength+"\n Compression Algorithm = "+this.type+"\n Compressed Data: Byte ["+util.hexstrdump(this.compressedData)+"]\n"};this.compress=function(b,a){this.type=b;this.decompressedData=a;switch(this.type){case 0:this.compressedData=
|
||||
this.decompressedData;break;case 1:util.print_error("Compression algorithm ZIP [RFC1951] is not implemented.");break;case 2:util.print_error("Compression algorithm ZLIB [RFC1950] is not implemented.");break;case 3:util.print_error("Compression algorithm BZip2 [BZ2] is not implemented.");break;default:util.print_error("Compression algorithm unknown :"+this.type)}this.packetLength=this.compressedData.length+1;return this.compressedData};this.decompress=function(){if(null!=this.decompressedData)return this.decompressedData;
|
||||
if(null==this.type)return null;switch(this.type){case 0:this.decompressedData=this.compressedData;break;case 1:var b=this.compressedData,b=s2r(b).replace(/\n/g,""),b=new JXG.Util.Unzip(JXG.Util.Base64.decodeAsArray(b)),b=unescape(b.deflate()[0][0]),b=openpgp_packet.read_packet(b,0,b.length);util.print_info("Decompressed packet [Type 1-ZIP]: "+b);this.decompressedData=b.data;break;case 2:8==this.compressedData.charCodeAt(0)%16?(b=this.compressedData.substring(0,this.compressedData.length-4),b=s2r(b).replace(/\n/g,
|
||||
""),b=JXG.decompress(b),b=openpgp_packet.read_packet(b,0,b.length),util.print_info("Decompressed packet [Type 2-ZLIB]: "+b),this.decompressedData=b.data):util.print_error("Compression algorithm ZLIB only supports DEFLATE compression method.");break;case 3:util.print_error("Compression algorithm BZip2 [BZ2] is not implemented.");break;default:util.print_error("Compression algorithm unknown :"+this.type)}util.print_debug("decompressed:"+util.hexstrdump(this.decompressedData));return this.decompressedData};
|
||||
if(null==this.type)return null;switch(this.type){case 0:this.decompressedData=this.compressedData;break;case 1:var b=this.compressedData,b=s2r(b).replace(/\n/g,""),a=new JXG.Util.Unzip(JXG.Util.Base64.decodeAsArray(b)),b=unescape(a.deflate()[0][0]),a=openpgp_packet.read_packet(b,0,b.length);util.print_info("Decompressed packet [Type 1-ZIP]: "+a);this.decompressedData=a.data;break;case 2:if(8==this.compressedData.charCodeAt(0)%16)for(a in b=this.compressedData.substring(0,this.compressedData.length-
|
||||
4),b=s2r(b).replace(/\n/g,""),b=JXG.decompress(b),b=openpgp.read_messages_dearmored({type:3,text:b,openpgp:b}),b){if(b[a].data)this.decompressedData=b[a].data}else util.print_error("Compression algorithm ZLIB only supports DEFLATE compression method.");break;case 3:util.print_error("Compression algorithm BZip2 [BZ2] is not implemented.");break;default:util.print_error("Compression algorithm unknown :"+this.type)}util.print_debug("decompressed:"+util.hexstrdump(this.decompressedData));return this.decompressedData};
|
||||
this.write_packet=function(b,a){this.decompressedData=a;if(null==b)this.type=1;var c=String.fromCharCode(this.type)+this.compress(this.type);return openpgp_packet.write_packet_header(8,c.length)+c}}
|
||||
function openpgp_packet_keymaterial(){this.subKeyRevocationSignature=this.subKeySignature=this.parentNode=this.checksum=this.hasUnencryptedSecretKeyData=this.encryptedMPIData=this.IVLength=this.s2kUsageConventions=this.symmetricEncryptionAlgorithm=this.publicKey=this.secMPIs=this.MPIs=this.expiration=this.version=this.creationTime=this.tagType=this.publicKeyAlgorithm=null;this.read_tag5=function(b,a,c){this.tagType=5;this.read_priv_key(b,a,c);return this};this.read_tag6=function(b,a,c){this.tagType=
|
||||
6;this.packetLength=c;this.read_pub_key(b,a,c);return this};this.read_tag7=function(b,a,c){this.tagType=7;this.packetLength=c;return this.read_priv_key(b,a,c)};this.read_tag14=function(b,a,c){this.subKeySignature=null;this.subKeyRevocationSignature=[];this.tagType=14;this.packetLength=c;this.read_pub_key(b,a,c);return this};this.toString=function(){var b="";switch(this.tagType){case 6:b+="5.5.1.1. Public-Key Packet (Tag 6)\n length: "+this.packetLength+"\n version: "+
|
||||
|
|
@ -369,21 +369,22 @@ function openpgp_crypto_getRandomBigInteger(b){if(0>b)return null;var a=openpgp_
|
|||
function openpgp_crypto_testRSA(b){debugger;var a=new RSA,c=new openpgp_type_mpi;c.create(openpgp_encoding_eme_pkcs1_encode("ABABABAB",128));c=a.encrypt(c.toBigInteger(),b.ee,b.n);a.decrypt(c,b.d,b.p,b.q,b.u)}
|
||||
function openpgp_crypto_generateKeyPair(b,a,c,d,e){var f,g,h=new Date,h=h.getTime()/1E3,h=String.fromCharCode(Math.floor(h/16777216%256))+String.fromCharCode(Math.floor(h/65536%256))+String.fromCharCode(Math.floor(h/256%256))+String.fromCharCode(Math.floor(h%256));switch(b){case 1:a=(new RSA).generate(a,"10001");f=(new openpgp_packet_keymaterial).write_private_key(b,a,c,d,e,h);g=(new openpgp_packet_keymaterial).write_public_key(b,a,h);break;default:util.print_error("Unknown keytype "+b)}return{privateKey:f,
|
||||
publicKey:g}}
|
||||
function _openpgp(){this.tostring="";this.generate_key_pair=function(b,a,c,d){var e=(new openpgp_packet_userid).write_packet(c),a=openpgp_crypto_generateKeyPair(b,a,d,openpgp.config.config.prefer_hash_algorithm,3),b=a.privateKey,f=(new openpgp_packet_keymaterial).read_priv_key(b.string,3,b.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);a=openpgp_encoding_armor(4,a.publicKey.string+e+c.openpgp);e=openpgp_encoding_armor(5,b.string+e+c.openpgp);return{privateKey:d,
|
||||
privateKeyArmored:e,publicKeyArmored:a}};this.write_signed_message=function(b,a){var c=(new openpgp_packet_signature).write_message_signature(1,a.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),b),c={text:a.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(b,a,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<a.length;f++){var g="",g=(new openpgp_packet_onepasssignature).write_packet(1,openpgp.config.config.prefer_hash_algorithm,b,!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"),b);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);b=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher);
|
||||
c="";for(f=0;f<a.length;f++){e=a[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,b)}c=openpgp.config.config.integrity_protect?c+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,b,d):c+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,
|
||||
b,d);return openpgp_encoding_armor(3,c,null,null)};this.write_encrypted_message=function(b,a){var c="",c=(new openpgp_packet_literaldata).write_packet(a.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<b.length;f++){var g=b[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(b){var a;try{a=openpgp_encoding_deArmor(b.replace(/\r/g,""))}catch(c){return util.print_error("no message found!"),
|
||||
null}for(var b=a.openpgp,d=[],e=0,f=0,g=b.length;f<b.length;){var h=openpgp_packet.read_packet(b,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=a.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 j=0;k;)d[e].sessionKeys[j]=h,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength,h=openpgp_packet.read_packet(b,f,g),1!=h.tagType&&3!=h.tagType&&(k=!1),j++;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=a.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(10==h.tagType)d.length=0,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength;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(b){for(var a=
|
||||
0,c=[],d=0,b=openpgp_encoding_deArmor(b.replace(/\r/g,"")).openpgp,e=b.length;a!=b.length;){var f=openpgp_packet.read_packet(b,a,e);if(153==b[a].charCodeAt()||6==f.tagType)c[d]=new openpgp_msg_publickey,c[d].header=b.substring(a,a+3),153==b[a].charCodeAt()?(a++,e=b[a++].charCodeAt()<<8|b[a++].charCodeAt(),c[d].publicKeyPacket=new openpgp_packet_keymaterial,c[d].publicKeyPacket.header=c[d].header,c[d].publicKeyPacket.read_tag6(b,a,e),a+=c[d].publicKeyPacket.packetLength,a+=c[d].read_nodes(c[d].publicKeyPacket,
|
||||
b,a,b.length-a)):(c[d]=new openpgp_msg_publickey,c[d].publicKeyPacket=f,a+=f.headerLength+f.packetLength,a+=c[d].read_nodes(f,b,a,b.length-a));else return util.print_error("no public key found!"),null;c[d].data=b.substring(0,a);d++}return c};this.read_privateKey=function(b){for(var a=[],c=0,d=0,b=openpgp_encoding_deArmor(b.replace(/\r/g,"")).openpgp,e=b.length;d!=b.length;){var f=openpgp_packet.read_packet(b,d,e);if(5==f.tagType)a[a.length]=new openpgp_msg_privatekey,d+=f.headerLength+f.packetLength,
|
||||
d+=a[c].read_nodes(f,b,d,e);else return util.print_error("no block packet found!"),null;a[c].data=b.substring(0,d);c++}return a};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 b=[],a=0;a<this.userIds.length;a++)b[a]=this.userIds[a].verifyCertificationSignatures(this.publicKeyPacket);return b};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 b=0;b<this.subKeys.length;b++)if(17!=this.subKeys[b].publicKeyAlgorithm&&3!=this.subKeys[b].publicKeyAlgorithm&&this.subKeys[b].verifyKey())return this.subKeys[b];return null};this.getSigningKey=function(){if(17==this.publicKeyPacket.publicKeyAlgorithm||2!=this.publicKeyPacket.publicKeyAlgorithm)return this.publicKeyPacket;if(4==this.publicKeyPacket.version)for(var b=
|
||||
function _openpgp(){function b(a){for(var b=a.openpgp,d=[],e=0,f=0,g=b.length;f<b.length;){var h=openpgp_packet.read_packet(b,f,g);if(!h)break;if(1==h.tagType||2==h.tagType&&16>h.signatureType||3==h.tagType||4==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=a.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 j=0;k;)d[e].sessionKeys[j]=h,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength,h=openpgp_packet.read_packet(b,f,g),1!=h.tagType&&3!=h.tagType&&(k=!1),j++;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=a.text;d[e].signature=h;break}else if(4==h.tagType)f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength;else if(8==h.tagType){util.print_error("A directly compressed message is currently not supported");break}else if(10==h.tagType)d.length=0,f+=h.packetLength+h.headerLength,g-=h.packetLength+h.headerLength;else{if(11==h.tagType)f+=h.packetLength+h.headerLength,g-=h.packetLength+
|
||||
h.headerLength,d[e].data=h.data,e++}else return util.print_error("no message found!"),null}return d}this.tostring="";this.generate_key_pair=function(a,b,d,e){var f=(new openpgp_packet_userid).write_packet(d),b=openpgp_crypto_generateKeyPair(a,b,e,openpgp.config.config.prefer_hash_algorithm,3),a=b.privateKey,g=(new openpgp_packet_keymaterial).read_priv_key(a.string,3,a.string.length);g.decryptSecretMPIs(e)||util.print_error("Issue creating key. Unable to read resulting private key");e=new openpgp_msg_privatekey;
|
||||
e.privateKeyPacket=g;e.getPreferredSignatureHashAlgorithm=function(){return openpgp.config.config.prefer_hash_algorithm};g=e.privateKeyPacket.publicKey.data;g=String.fromCharCode(153)+String.fromCharCode(g.length>>8&255)+String.fromCharCode(g.length&255)+g+String.fromCharCode(180)+String.fromCharCode(d.length>>24)+String.fromCharCode(d.length>>16&255)+String.fromCharCode(d.length>>8&255)+String.fromCharCode(d.length&255)+d;d=new openpgp_packet_signature;d=d.write_message_signature(16,g,e);b=openpgp_encoding_armor(4,
|
||||
b.publicKey.string+f+d.openpgp);f=openpgp_encoding_armor(5,a.string+f+d.openpgp);return{privateKey:e,privateKeyArmored:f,publicKeyArmored:b}};this.write_signed_message=function(a,b){var d=(new openpgp_packet_signature).write_message_signature(1,b.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),a),d={text:b.replace(/\r\n/g,"\n").replace(/\n/,"\r\n"),openpgp:d.openpgp,hash:d.hash};return openpgp_encoding_armor(2,d,null,null)};this.write_signed_and_encrypted_message=function(a,b,d){var e="",f=(new openpgp_packet_literaldata).write_packet(d.replace(/\r\n/g,
|
||||
"\n").replace(/\n/g,"\r\n"));util.print_debug_hexstr_dump("literal_packet: |"+f+"|\n",f);for(var g=0;g<b.length;g++){var h="",h=(new openpgp_packet_onepasssignature).write_packet(1,openpgp.config.config.prefer_hash_algorithm,a,!1);util.print_debug_hexstr_dump("onepasssigstr: |"+h+"|\n",h);var k=(new openpgp_packet_signature).write_message_signature(1,d.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"),a);util.print_debug_hexstr_dump("datasignature: |"+k.openpgp+"|\n",k.openpgp);e=0==g?h+f+k.openpgp:h+e+
|
||||
k.openpgp}util.print_debug_hexstr_dump("signed packet: |"+e+"|\n",e);a=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher);d="";for(g=0;g<b.length;g++){f=b[g].getEncryptionKey();if(null==f)return util.print_error("no encryption key found! Key is for signing only."),null;d+=(new openpgp_packet_encryptedsessionkey).write_pub_key_packet(f.getKeyId(),f.MPIs,f.publicKeyAlgorithm,openpgp.config.config.encryption_cipher,a)}d=openpgp.config.config.integrity_protect?d+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,
|
||||
a,e):d+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,a,e);return openpgp_encoding_armor(3,d,null,null)};this.write_encrypted_message=function(a,b){var d="",d=(new openpgp_packet_literaldata).write_packet(b.replace(/\r\n/g,"\n").replace(/\n/g,"\r\n"));util.print_debug_hexstr_dump("literal_packet: |"+d+"|\n",d);for(var e=openpgp_crypto_generateSessionKey(openpgp.config.config.encryption_cipher),f="",g=0;g<a.length;g++){var h=a[g].getEncryptionKey();if(null==
|
||||
h)return util.print_error("no encryption key found! Key is for signing only."),null;f+=(new openpgp_packet_encryptedsessionkey).write_pub_key_packet(h.getKeyId(),h.MPIs,h.publicKeyAlgorithm,openpgp.config.config.encryption_cipher,e)}f=openpgp.config.config.integrity_protect?f+(new openpgp_packet_encryptedintegrityprotecteddata).write_packet(openpgp.config.config.encryption_cipher,e,d):f+(new openpgp_packet_encrypteddata).write_packet(openpgp.config.config.encryption_cipher,e,d);return openpgp_encoding_armor(3,
|
||||
f,null,null)};this.read_message=function(a){var c;try{c=openpgp_encoding_deArmor(a.replace(/\r/g,""))}catch(d){return util.print_error("no message found!"),null}return b(c)};this.read_messages_dearmored=b;this.read_publicKey=function(a){for(var b=0,d=[],e=0,a=openpgp_encoding_deArmor(a.replace(/\r/g,"")).openpgp,f=a.length;b!=a.length;){var g=openpgp_packet.read_packet(a,b,f);if(153==a[b].charCodeAt()||6==g.tagType)d[e]=new openpgp_msg_publickey,d[e].header=a.substring(b,b+3),153==a[b].charCodeAt()?
|
||||
(b++,f=a[b++].charCodeAt()<<8|a[b++].charCodeAt(),d[e].publicKeyPacket=new openpgp_packet_keymaterial,d[e].publicKeyPacket.header=d[e].header,d[e].publicKeyPacket.read_tag6(a,b,f),b+=d[e].publicKeyPacket.packetLength,b+=d[e].read_nodes(d[e].publicKeyPacket,a,b,a.length-b)):(d[e]=new openpgp_msg_publickey,d[e].publicKeyPacket=g,b+=g.headerLength+g.packetLength,b+=d[e].read_nodes(g,a,b,a.length-b));else return util.print_error("no public key found!"),null;d[e].data=a.substring(0,b);e++}return d};this.read_privateKey=
|
||||
function(a){for(var b=[],d=0,e=0,a=openpgp_encoding_deArmor(a.replace(/\r/g,"")).openpgp,f=a.length;e!=a.length;){var g=openpgp_packet.read_packet(a,e,f);if(5==g.tagType)b[b.length]=new openpgp_msg_privatekey,e+=g.headerLength+g.packetLength,e+=b[d].read_nodes(g,a,e,f);else return util.print_error("no block packet found!"),null;b[d].data=a.substring(0,e);d++}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 b=[],a=0;a<this.userIds.length;a++)b[a]=this.userIds[a].verifyCertificationSignatures(this.publicKeyPacket);return b};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 b=0;b<this.subKeys.length;b++)if(17!=this.subKeys[b].publicKeyAlgorithm&&3!=this.subKeys[b].publicKeyAlgorithm&&this.subKeys[b].verifyKey())return this.subKeys[b];return null};this.getSigningKey=function(){if(17==this.publicKeyPacket.publicKeyAlgorithm||2!=this.publicKeyPacket.publicKeyAlgorithm)return this.publicKeyPacket;if(4==this.publicKeyPacket.version)for(var b=
|
||||
0;b<this.subKeys.length;b++)if((17==this.subKeys[b].publicKeyAlgorithm||2!=this.subKeys[b].publicKeyAlgorithm)&&this.subKeys[b].verifyKey())return this.subKeys[b];return null};this.read_nodes=function(b,a,c,d){this.publicKeyPacket=b;for(b=c;a.length!=b;){var e=openpgp_packet.read_packet(a,b,a.length-b);if(null==e){util.print_error("openpgp.msg.publickey read_nodes:\n[pub_key]parsing ends here @:"+b+" l:"+d);break}else switch(e.tagType){case 2:32==e.signatureType?this.revocationSignatures[this.revocationSignatures.length]=
|
||||
e:16==e.signatureType||17==e.signatureType||18==e.signatureType||19==e.signatureType?this.certificationSignature=e:25==e.signatureType?this.bindingSignature=e:31==e.signatureType?this.directSignatures[this.directSignatures.length]=e:util.print_error("openpgp.msg.publickey read_nodes:\nunknown signature type directly on key "+e.signatureType);b+=e.packetLength+e.headerLength;break;case 14:this.subKeys[this.subKeys.length]=e;b+=e.packetLength+e.headerLength;b+=e.read_nodes(this.publicKeyPacket,a,b,
|
||||
a.length-b);break;case 17:this.userAttributes[this.userAttributes.length]=e;b+=e.packetLength+e.headerLength;b+=e.read_nodes(this.publicKeyPacket,a,b,a.length-b);break;case 13:this.userIds[this.userIds.length]=e;b+=e.packetLength+e.headerLength;b+=e.read_nodes(this.publicKeyPacket,a,b,a.length-b);break;default:return this.data=a,this.position=c-this.publicKeyPacket.packetLength-this.publicKeyPacket.headerLength,this.len=b-c}}this.data=a;this.position=c-(this.publicKeyPacket.packetLength-this.publicKeyPacket.headerLength);
|
||||
|
|
@ -391,7 +392,7 @@ return this.len=b-c};this.write=function(){};this.toString=function(){for(var b=
|
|||
this.subKeys.length;a++)b+=" "+this.subKeys[a].toString();return b};this.validate=function(){for(var b=0;b<this.revocationSignatures.length;b++)if(this.revocationSignatures[b].verify(this.publicKeyPacket.header+this.publicKeyPacket.data,this.publicKeyPacket))return!1;if(0!=this.subKeys.length){for(var a=!1,b=0;b<this.subKeys.length;b++)if(3==this.subKeys[b].verifyKey()){a=!0;break}if(!a)return!1}a=!1;for(b=0;b<this.userIds.length;b++)if(0==this.userIds[b].verify(this.publicKeyPacket)){a=!0;break}return!a?
|
||||
!1:!0};this.getFingerprint=function(){return this.publicKeyPacket.getFingerprint()};this.getKeyId=function(){return this.publicKeyPacket.getKeyId()};this.verifyBasicSignatures=function(){for(var b=0;b<this.revocationSignatures.length;)return this.revocationSignatures[b].verify(this.publicKeyPacket.header+this.publicKeyPacket.data,this.publicKeyPacket),!1;if(0!=this.subKeys.length){for(var a=!1,b=0;b<this.subKeys.length;b++)if(null!=this.subKeys[b]&&3==this.subKeys[b].verifyKey()){a=!0;break}if(!a)return!1}a=
|
||||
this.getKeyId();for(b=0;b<this.userIds.length;b++)for(var c=0;c<this.userIds[b].certificationRevocationSignatures.length;c++)if(this.userIds[b].certificationSignatures[c].getIssuer==a&&4!=this.userIds[b].certificationSignatures[c].verifyBasic(this.publicKeyPacket))return!1;return!0}}
|
||||
function openpgp_config(){this.config=null;this.default_config={prefer_hash_algorithm:2,encryption_cipher:9,compression:1,show_version:!0,show_comment:!0,integrity_protect:!0,composition_behavior:0,keyserver:"keyserver.linux.it"};this.versionstring="OpenPGP.js v.1.20120911";this.commentstring="http://openpgpjs.org";this.debug=!1;this.read=function(){var b=JSON.parse(window.localStorage.getItem("config"));null==b?(this.config=this.default_config,this.write()):this.config=b};this.write=function(){window.localStorage.setItem("config",
|
||||
function openpgp_config(){this.config=null;this.default_config={prefer_hash_algorithm:2,encryption_cipher:9,compression:1,show_version:!0,show_comment:!0,integrity_protect:!0,composition_behavior:0,keyserver:"keyserver.linux.it"};this.versionstring="OpenPGP.js v.1.20121006";this.commentstring="http://openpgpjs.org";this.debug=!1;this.read=function(){var b=JSON.parse(window.localStorage.getItem("config"));null==b?(this.config=this.default_config,this.write()):this.config=b};this.write=function(){window.localStorage.setItem("config",
|
||||
JSON.stringify(this.config))}}
|
||||
function openpgp_msg_privatekey(){this.subKeys=[];this.privateKeyPacket=null;this.userIds=[];this.userAttributes=[];this.revocationSignatures=[];this.subKeys=[];this.extractPublicKey=function(){for(var b=this.privateKeyPacket.publicKey.header+this.privateKeyPacket.publicKey.data,a=0;a<this.userIds.length;a++){if(0===this.userIds[a].certificationSignatures.length)return util.print_error("extractPublicKey - missing certification signatures"),null;for(var c=new openpgp_packet_userid,b=b+c.write_packet(this.userIds[a].text),
|
||||
c=0;c<this.userIds[a].certificationSignatures.length;c++)var d=this.userIds[a].certificationSignatures[c],b=b+(openpgp_packet.write_packet_header(2,d.data.length)+d.data)}for(a=0;a<this.subKeys.length;a++)if(c=this.subKeys[a].publicKey,b+=openpgp_packet.write_old_packet_header(14,c.data.length)+c.data,c=this.subKeys[a].subKeySignature,null!==c)b+=openpgp_packet.write_packet_header(2,c.data.length)+c.data;else return util.print_error("extractPublicKey - missing subkey signature"),null;return openpgp_encoding_armor(4,
|
||||
|
|
@ -429,15 +430,15 @@ U);if(17==N)return-1;U++;N++;b=g();m&&document.write("<br>IsPat "+b);if(0<=b)a.b
|
|||
alert("invalid huffman tree\n"),-1;if(m){document.write("<br>Tree: "+V.length);for(a=0;32>a;a++)document.write("Places["+a+"].b0="+V[a].b0+"<br>"),document.write("Places["+a+"].b1="+V[a].b1+"<br>")}return 0}function j(a){for(var b,d,e=0,f=a[e];;)if(b=c(),m&&document.write("b="+b),b){if(!(f.b1&32768))return m&&document.write("ret1"),f.b1;f=f.jump;b=a.length;for(d=0;d<b;d++)if(a[d]===f){e=d;break}}else{if(!(f.b0&32768))return m&&document.write("ret2"),f.b0;e++;f=a[e]}m&&document.write("ret3");return-1}
|
||||
function l(){var b,g,h,l,p;do{b=c();h=d(2);switch(h){case 0:m&&alert("Stored\n");break;case 1:m&&alert("Fixed Huffman codes\n");break;case 2:m&&alert("Dynamic Huffman codes\n");break;case 3:m&&alert("Reserved block type!!\n");break;default:m&&alert("Unexpected value %d!\n",h)}if(0==h){C=1;h=a();h|=a()<<8;g=a();g|=a()<<8;for((h^~g)&65535&&document.write("BlockLen checksum mismatch\n");h--;)g=a(),e(g)}else if(1==h)for(;;)if(h=D[d(7)]>>1,23<h?(h=h<<1|c(),199<h?(h-=128,h=h<<1|c()):(h-=48,143<h&&(h+=136))):
|
||||
h+=256,256>h)e(h);else if(256==h)break;else{var o;h-=257;p=d(K[h])+M[h];h=D[d(5)]>>3;8<z[h]?(o=d(8),o|=d(z[h]-8)<<8):o=d(z[h]);o+=w[h];for(h=0;h<p;h++)g=u[t-o&32767],e(g)}else if(2==h){var r=Array(320);g=257+d(5);o=1+d(5);l=4+d(4);for(h=0;19>h;h++)r[h]=0;for(h=0;h<l;h++)r[T[h]]=d(3);p=P.length;for(l=0;l<p;l++)P[l]=new f;if(k(P,19,r,0))return t=0,1;if(m){document.write("<br>distanceTree");for(h=0;h<P.length;h++)document.write("<br>"+P[h].b0+" "+P[h].b1+" "+P[h].jump+" "+P[h].jumppos)}p=g+o;l=0;var v=
|
||||
-1;for(m&&document.write("<br>n="+p+" bits: "+aa+"<br>");l<p;)if(v++,h=j(P),m&&document.write("<br>"+v+" i:"+l+" decode: "+h+" bits "+aa+"<br>"),16>h)r[l++]=h;else if(16==h){var x;h=3+d(2);if(l+h>p)return t=0,1;for(x=l?r[l-1]:0;h--;)r[l++]=x}else{h=17==h?3+d(3):11+d(7);if(l+h>p)return t=0,1;for(;h--;)r[l++]=0}p=ba.length;for(l=0;l<p;l++)ba[l]=new f;if(k(ba,g,r,0))return t=0,1;p=ba.length;for(l=0;l<p;l++)P[l]=new f;h=[];for(l=g;l<r.length;l++)h[l-g]=r[l];if(k(P,o,h,0))return t=0,1;for(m&&document.write("<br>literalTree");;)if(h=
|
||||
j(ba),256<=h){h-=256;if(0==h)break;h--;p=d(K[h])+M[h];h=j(P);8<z[h]?(o=d(8),o|=d(z[h]-8)<<8):o=d(z[h]);for(o+=w[h];p--;)g=u[t-o&32767],e(g)}else e(h)}}while(!b);t=0;C=1;return 0}function o(){m&&alert("NEXTFILE");p=[];var b=[];E=!1;b[0]=a();b[1]=a();m&&alert("type: "+b[0]+" "+b[1]);120==b[0]&&218==b[1]&&(m&&alert("GEONExT-GZIP"),l(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=p.join(""),v[x][1]="geonext.gxt",x++);120==b[0]&&156==b[1]&&(m&&alert("ZLIB"),l(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=
|
||||
p.join(""),v[x][1]="ZLIB",x++);31==b[0]&&139==b[1]&&(m&&alert("GZIP"),r(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=p.join(""),v[x][1]="file",x++);if(80==b[0]&&75==b[1]&&(E=!0,b[2]=a(),b[3]=a(),3==b[2]&&4==b[3])){b[0]=a();b[1]=a();m&&alert("ZIP-Version: "+b[1]+" "+b[0]/10+"."+b[0]%10);y=a();y|=a()<<8;m&&alert("gpflags: "+y);b=a();b|=a()<<8;m&&alert("method: "+b);a();a();a();a();var c=a(),c=c|a()<<8,c=c|a()<<16,c=c|a()<<24,d=a(),d=d|a()<<8,d=d|a()<<16,d=d|a()<<24,e=a(),e=e|a()<<8,e=e|a()<<16,e=e|
|
||||
a()<<24;m&&alert("local CRC: "+c+"\nlocal Size: "+e+"\nlocal CompSize: "+d);c=a();c|=a()<<8;d=a();d|=a()<<8;m&&alert("filelen "+c);f=0;for(R=[];c--;)e=a(),"/"==e|":"==e?f=0:f<oa-1&&(R[f++]=String.fromCharCode(e));m&&alert("nameBuf: "+R);pa||(pa=R);for(var f=0;f<d;)a(),f++;Q=0;8==b&&(l(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=p.join(""),v[x][1]=R.join(""),x++);r()}}function r(){var b=[],c;y&8&&(b[0]=a(),b[1]=a(),b[2]=a(),b[3]=a(),80==b[0]&&75==b[1]&&7==b[2]&&8==b[3]&&(a(),a(),a(),a()),a(),a(),
|
||||
a(),a(),a(),a(),a(),a(),m&&alert("CRC:"));E&&o();b[0]=a();if(8!=b[0])return m&&alert("Unknown compression method!"),0;y=a();m&&y&-32&&alert("Unknown flags set!");a();a();a();a();a();a();if(y&4){b[0]=a();b[2]=a();N=b[0]+256*b[1];m&&alert("Extra field size: "+N);for(b=0;b<N;b++)a()}if(y&8){b=0;for(R=[];c=a();){if("7"==c||":"==c)b=0;b<oa-1&&(R[b++]=c)}m&&alert("original file name: "+R)}if(y&16)for(;a(););y&2&&(a(),a());l();a();a();a();a();a();a();a();a();E&&o()}var p=[],m=!1,y,x=0,v=[],u=Array(32768),
|
||||
t=0,E=!1,Q,D=[0,128,64,192,32,160,96,224,16,144,80,208,48,176,112,240,8,136,72,200,40,168,104,232,24,152,88,216,56,184,120,248,4,132,68,196,36,164,100,228,20,148,84,212,52,180,116,244,12,140,76,204,44,172,108,236,28,156,92,220,60,188,124,252,2,130,66,194,34,162,98,226,18,146,82,210,50,178,114,242,10,138,74,202,42,170,106,234,26,154,90,218,58,186,122,250,6,134,70,198,38,166,102,230,22,150,86,214,54,182,118,246,14,142,78,206,46,174,110,238,30,158,94,222,62,190,126,254,1,129,65,193,33,161,97,225,17,
|
||||
145,81,209,49,177,113,241,9,137,73,201,41,169,105,233,25,153,89,217,57,185,121,249,5,133,69,197,37,165,101,229,21,149,85,213,53,181,117,245,13,141,77,205,45,173,109,237,29,157,93,221,61,189,125,253,3,131,67,195,35,163,99,227,19,147,83,211,51,179,115,243,11,139,75,203,43,171,107,235,27,155,91,219,59,187,123,251,7,135,71,199,39,167,103,231,23,151,87,215,55,183,119,247,15,143,79,207,47,175,111,239,31,159,95,223,63,191,127,255],M=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,
|
||||
163,195,227,258,0,0],K=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,99,99],w=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],z=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],T=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],A=b,B=0,C=1,aa=0,oa=256,R=[],pa,ba=Array(288),P=Array(32),U=0,V=null,N=0,W=Array(17);W[0]=0;var qa,ra;JXG.Util.Unzip.prototype.unzipFile=function(a){var b;this.unzip();for(b=
|
||||
0;b<v.length;b++)if(v[b][1]==a)return v[b][0]};JXG.Util.Unzip.prototype.deflate=function(){p=[];E=!1;l();m&&alert(p.join(""));v[x]=Array(2);v[x][0]=p.join("");v[x][1]="DEFLATE";x++;return v};JXG.Util.Unzip.prototype.unzip=function(){m&&alert(A);o();return v}};
|
||||
-1;for(m&&document.write("<br>n="+p+" bits: "+aa+"<br>");l<p;)if(v++,h=j(P),m&&document.write("<br>"+v+" i:"+l+" decode: "+h+" bits "+aa+"<br>"),16>h)r[l++]=h;else if(16==h){var x;h=3+d(2);if(l+h>p)return t=0,1;for(x=l?r[l-1]:0;h--;)r[l++]=x}else{h=17==h?3+d(3):11+d(7);if(l+h>p)return t=0,1;for(;h--;)r[l++]=0}p=ba.length;for(l=0;l<p;l++)ba[l]=new f;if(k(ba,g,r,0))return t=0,1;p=ba.length;for(l=0;l<p;l++)P[l]=new f;h=[];for(l=g;l<r.length;l++)h[l-g]=r[l];if(k(P,o,h,0))return t=0,1;m&&document.write("<br>literalTree");
|
||||
a:for(;;)if(h=j(ba),256<=h){h-=256;if(0==h)break;h--;p=d(K[h])+M[h];h=j(P);8<z[h]?(o=d(8),o|=d(z[h]-8)<<8):o=d(z[h]);for(o+=w[h];p--;){if(0>t-o)break a;g=u[t-o&32767];e(g)}}else e(h)}}while(!b);t=0;C=1;return 0}function o(){m&&alert("NEXTFILE");p=[];var b=[];E=!1;b[0]=a();b[1]=a();m&&alert("type: "+b[0]+" "+b[1]);120==b[0]&&218==b[1]&&(m&&alert("GEONExT-GZIP"),l(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=p.join(""),v[x][1]="geonext.gxt",x++);120==b[0]&&156==b[1]&&(m&&alert("ZLIB"),l(),m&&alert(p.join("")),
|
||||
v[x]=Array(2),v[x][0]=p.join(""),v[x][1]="ZLIB",x++);31==b[0]&&139==b[1]&&(m&&alert("GZIP"),r(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=p.join(""),v[x][1]="file",x++);if(80==b[0]&&75==b[1]&&(E=!0,b[2]=a(),b[3]=a(),3==b[2]&&4==b[3])){b[0]=a();b[1]=a();m&&alert("ZIP-Version: "+b[1]+" "+b[0]/10+"."+b[0]%10);y=a();y|=a()<<8;m&&alert("gpflags: "+y);b=a();b|=a()<<8;m&&alert("method: "+b);a();a();a();a();var c=a(),c=c|a()<<8,c=c|a()<<16,c=c|a()<<24,d=a(),d=d|a()<<8,d=d|a()<<16,d=d|a()<<24,e=a(),e=e|a()<<
|
||||
8,e=e|a()<<16,e=e|a()<<24;m&&alert("local CRC: "+c+"\nlocal Size: "+e+"\nlocal CompSize: "+d);c=a();c|=a()<<8;d=a();d|=a()<<8;m&&alert("filelen "+c);f=0;for(R=[];c--;)e=a(),"/"==e|":"==e?f=0:f<oa-1&&(R[f++]=String.fromCharCode(e));m&&alert("nameBuf: "+R);pa||(pa=R);for(var f=0;f<d;)a(),f++;Q=0;8==b&&(l(),m&&alert(p.join("")),v[x]=Array(2),v[x][0]=p.join(""),v[x][1]=R.join(""),x++);r()}}function r(){var b=[],c;y&8&&(b[0]=a(),b[1]=a(),b[2]=a(),b[3]=a(),80==b[0]&&75==b[1]&&7==b[2]&&8==b[3]&&(a(),a(),
|
||||
a(),a()),a(),a(),a(),a(),a(),a(),a(),a(),m&&alert("CRC:"));E&&o();b[0]=a();if(8!=b[0])return m&&alert("Unknown compression method!"),0;y=a();m&&y&-32&&alert("Unknown flags set!");a();a();a();a();a();a();if(y&4){b[0]=a();b[2]=a();N=b[0]+256*b[1];m&&alert("Extra field size: "+N);for(b=0;b<N;b++)a()}if(y&8){b=0;for(R=[];c=a();){if("7"==c||":"==c)b=0;b<oa-1&&(R[b++]=c)}m&&alert("original file name: "+R)}if(y&16)for(;a(););y&2&&(a(),a());l();a();a();a();a();a();a();a();a();E&&o()}var p=[],m=!1,y,x=0,v=
|
||||
[],u=Array(32768),t=0,E=!1,Q,D=[0,128,64,192,32,160,96,224,16,144,80,208,48,176,112,240,8,136,72,200,40,168,104,232,24,152,88,216,56,184,120,248,4,132,68,196,36,164,100,228,20,148,84,212,52,180,116,244,12,140,76,204,44,172,108,236,28,156,92,220,60,188,124,252,2,130,66,194,34,162,98,226,18,146,82,210,50,178,114,242,10,138,74,202,42,170,106,234,26,154,90,218,58,186,122,250,6,134,70,198,38,166,102,230,22,150,86,214,54,182,118,246,14,142,78,206,46,174,110,238,30,158,94,222,62,190,126,254,1,129,65,193,
|
||||
33,161,97,225,17,145,81,209,49,177,113,241,9,137,73,201,41,169,105,233,25,153,89,217,57,185,121,249,5,133,69,197,37,165,101,229,21,149,85,213,53,181,117,245,13,141,77,205,45,173,109,237,29,157,93,221,61,189,125,253,3,131,67,195,35,163,99,227,19,147,83,211,51,179,115,243,11,139,75,203,43,171,107,235,27,155,91,219,59,187,123,251,7,135,71,199,39,167,103,231,23,151,87,215,55,183,119,247,15,143,79,207,47,175,111,239,31,159,95,223,63,191,127,255],M=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,
|
||||
67,83,99,115,131,163,195,227,258,0,0],K=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,99,99],w=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],z=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],T=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],A=b,B=0,C=1,aa=0,oa=256,R=[],pa,ba=Array(288),P=Array(32),U=0,V=null,N=0,W=Array(17);W[0]=0;var qa,ra;JXG.Util.Unzip.prototype.unzipFile=function(a){var b;this.unzip();
|
||||
for(b=0;b<v.length;b++)if(v[b][1]==a)return v[b][0]};JXG.Util.Unzip.prototype.deflate=function(){p=[];E=!1;l();m&&alert(p.join(""));v[x]=Array(2);v[x][0]=p.join("");v[x][1]="DEFLATE";x++;return v};JXG.Util.Unzip.prototype.unzip=function(){m&&alert(A);o();return v}};
|
||||
JXG.Util.Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(b){for(var a=[],c,d,e,f,g,h,k=0,b=JXG.Util.Base64._utf8_encode(b);k<b.length;)c=b.charCodeAt(k++),d=b.charCodeAt(k++),e=b.charCodeAt(k++),f=c>>2,c=(c&3)<<4|d>>4,g=(d&15)<<2|e>>6,h=e&63,isNaN(d)?g=h=64:isNaN(e)&&(h=64),a.push([this._keyStr.charAt(f),this._keyStr.charAt(c),this._keyStr.charAt(g),this._keyStr.charAt(h)].join(""));return a.join("")},decode:function(b,a){for(var c=[],d,e,f,g,h,
|
||||
k=0,b=b.replace(/[^A-Za-z0-9\+\/\=]/g,"");k<b.length;)d=this._keyStr.indexOf(b.charAt(k++)),e=this._keyStr.indexOf(b.charAt(k++)),g=this._keyStr.indexOf(b.charAt(k++)),h=this._keyStr.indexOf(b.charAt(k++)),d=d<<2|e>>4,e=(e&15)<<4|g>>2,f=(g&3)<<6|h,c.push(String.fromCharCode(d)),64!=g&&c.push(String.fromCharCode(e)),64!=h&&c.push(String.fromCharCode(f));c=c.join("");a&&(c=JXG.Util.Base64._utf8_decode(c));return c},_utf8_encode:function(b){for(var b=b.replace(/\r\n/g,"\n"),a="",c=0;c<b.length;c++){var d=
|
||||
b.charCodeAt(c);128>d?a+=String.fromCharCode(d):(127<d&&2048>d?a+=String.fromCharCode(d>>6|192):(a+=String.fromCharCode(d>>12|224),a+=String.fromCharCode(d>>6&63|128)),a+=String.fromCharCode(d&63|128))}return a},_utf8_decode:function(b){for(var a=[],c=0,d=0,e=0,f=0;c<b.length;)d=b.charCodeAt(c),128>d?(a.push(String.fromCharCode(d)),c++):191<d&&224>d?(e=b.charCodeAt(c+1),a.push(String.fromCharCode((d&31)<<6|e&63)),c+=2):(e=b.charCodeAt(c+1),f=b.charCodeAt(c+2),a.push(String.fromCharCode((d&15)<<12|
|
||||
|
|
|
|||
|
|
@ -575,6 +575,7 @@ JXG.Util.Unzip = function (barray){
|
|||
}
|
||||
if (debug)
|
||||
document.write("<br>literalTree");
|
||||
outer:
|
||||
while(1) {
|
||||
j = DecodeValue(literalTree);
|
||||
if(j >= 256) { // In C64: if carry set
|
||||
|
|
@ -596,6 +597,9 @@ JXG.Util.Unzip = function (barray){
|
|||
}
|
||||
dist += cpdist[j];
|
||||
while(len--) {
|
||||
if(bIdx - dist < 0) {
|
||||
break outer;
|
||||
}
|
||||
var c = buf32k[(bIdx - dist) & 0x7fff];
|
||||
addBuffer(c);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -137,13 +137,20 @@ function _openpgp () {
|
|||
util.print_error('no message found!');
|
||||
return null;
|
||||
}
|
||||
var input = dearmored.openpgp;
|
||||
return read_messages_dearmored(dearmored);
|
||||
}
|
||||
|
||||
function read_messages_dearmored(input){
|
||||
var messageString = input.openpgp;
|
||||
var messages = new Array();
|
||||
var messageCount = 0;
|
||||
var mypos = 0;
|
||||
var l = input.length;
|
||||
while (mypos < input.length) {
|
||||
var first_packet = openpgp_packet.read_packet(input, mypos, l);
|
||||
var l = messageString.length;
|
||||
while (mypos < messageString.length) {
|
||||
var first_packet = openpgp_packet.read_packet(messageString, mypos, l);
|
||||
if (!first_packet) {
|
||||
break;
|
||||
}
|
||||
// public key parser (definition from the standard:)
|
||||
// OpenPGP Message :- Encrypted Message | Signed Message |
|
||||
// Compressed Message | Literal Message.
|
||||
|
|
@ -169,6 +176,7 @@ function _openpgp () {
|
|||
if (first_packet.tagType == 1 ||
|
||||
(first_packet.tagType == 2 && first_packet.signatureType < 16) ||
|
||||
first_packet.tagType == 3 ||
|
||||
first_packet.tagType == 4 ||
|
||||
first_packet.tagType == 8 ||
|
||||
first_packet.tagType == 9 ||
|
||||
first_packet.tagType == 10 ||
|
||||
|
|
@ -177,7 +185,7 @@ function _openpgp () {
|
|||
first_packet.tagType == 19) {
|
||||
messages[messages.length] = new openpgp_msg_message();
|
||||
messages[messageCount].messagePacket = first_packet;
|
||||
messages[messageCount].type = dearmored.type;
|
||||
messages[messageCount].type = input.type;
|
||||
// Encrypted Message
|
||||
if (first_packet.tagType == 9 ||
|
||||
first_packet.tagType == 1 ||
|
||||
|
|
@ -195,7 +203,7 @@ function _openpgp () {
|
|||
messages[messageCount].sessionKeys[sessionKeyCount] = first_packet;
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
first_packet = openpgp_packet.read_packet(input, mypos, l);
|
||||
first_packet = openpgp_packet.read_packet(messageString, mypos, l);
|
||||
|
||||
if (first_packet.tagType != 1 && first_packet.tagType != 3)
|
||||
issessionkey = false;
|
||||
|
|
@ -219,12 +227,19 @@ function _openpgp () {
|
|||
} else
|
||||
// Signed Message
|
||||
if (first_packet.tagType == 2 && first_packet.signatureType < 3) {
|
||||
messages[messageCount].text = dearmored.text;
|
||||
messages[messageCount].text = input.text;
|
||||
messages[messageCount].signature = first_packet;
|
||||
break;
|
||||
} else
|
||||
// Signed Message
|
||||
if (first_packet.tagType == 4) {
|
||||
//TODO: Implement check
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
} else
|
||||
// Compressed Message
|
||||
// TODO: needs to be implemented. From a security perspective: this message is plaintext anyway.
|
||||
// This has been implemented as part of processing. Check openpgp.packet.
|
||||
if (first_packet.tagType == 8) {
|
||||
util.print_error("A directly compressed message is currently not supported");
|
||||
break;
|
||||
|
|
@ -237,12 +252,13 @@ function _openpgp () {
|
|||
// continue with next packet
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
} else
|
||||
// Literal Message
|
||||
// TODO: needs to be implemented. From a security perspective: this message is plaintext anyway.
|
||||
} else
|
||||
if (first_packet.tagType == 11) {
|
||||
util.print_error("A direct literal message is currently not supported.");
|
||||
break;
|
||||
// Literal Message -- work is already done in read_packet
|
||||
mypos += first_packet.packetLength + first_packet.headerLength;
|
||||
l -= (first_packet.packetLength + first_packet.headerLength);
|
||||
messages[messageCount].data = first_packet.data;
|
||||
messageCount++;
|
||||
}
|
||||
} else {
|
||||
util.print_error('no message found!');
|
||||
|
|
@ -407,6 +423,7 @@ function _openpgp () {
|
|||
this.write_signed_and_encrypted_message = write_signed_and_encrypted_message;
|
||||
this.write_encrypted_message = write_encrypted_message;
|
||||
this.read_message = read_message;
|
||||
this.read_messages_dearmored = read_messages_dearmored;
|
||||
this.read_publicKey = read_publicKey;
|
||||
this.read_privateKey = read_privateKey;
|
||||
this.init = init;
|
||||
|
|
|
|||
|
|
@ -80,9 +80,13 @@ function openpgp_packet_compressed() {
|
|||
var radix = s2r(compData).replace(/\n/g,"");
|
||||
var outputString = JXG.decompress(radix);
|
||||
//TODO check ADLER32 checksum
|
||||
var packet = openpgp_packet.read_packet(outputString, 0, outputString.length);
|
||||
util.print_info('Decompressed packet [Type 2-ZLIB]: ' + packet);
|
||||
this.decompressedData = packet.data;
|
||||
var dearmored = {type: 3, text: outputString, openpgp: outputString};
|
||||
var messages = openpgp.read_messages_dearmored(dearmored);
|
||||
for(var m in messages){
|
||||
if(messages[m].data){
|
||||
this.decompressedData = messages[m].data;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
util.print_error("Compression algorithm ZLIB only supports DEFLATE compression method.");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,7 +134,6 @@ function _openpgp_packet() {
|
|||
mypos++;
|
||||
|
||||
// parsed length from length field
|
||||
var len = 0;
|
||||
var bodydata = null;
|
||||
|
||||
// used for partial body lengths
|
||||
|
|
@ -169,6 +168,8 @@ function _openpgp_packet() {
|
|||
// definite length, or a new format header. The new format
|
||||
// headers described below have a mechanism for precisely
|
||||
// encoding data of indeterminate length.
|
||||
packet_length = len;
|
||||
break;
|
||||
}
|
||||
|
||||
} else // 4.2.2. New Format Packet Lengths
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user