suzanne.soy/fork-openpgpjs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MD5 now returns binary string format instead of hex

Browse Source
This commit is contained in:
Tankred Hase 2012-03-18 22:48:44 +11:00
parent 1d1e757153
commit b348ccc2ab
4 changed files with 41 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
resources/openpgp.js
View File

@ -1649,7 +1649,9 @@ function RSA() {
*/
function MD5(entree) {
return md5(entree);
var hex = md5(entree);
var bin = util.hex2bin(hex);
return bin;
}
function md5cycle(x, k) {
@ -11541,6 +11543,7 @@ var Util = function() {
}
return r.join('');
};
/**
* create hexstring from a binary
* @param str [String] string to convert
@ -11560,6 +11563,19 @@ var Util = function() {
}
return r.join('');
};
/**
* create binary string from a hex encoded string
* @param str [String] hex string to convert
* @return [String] string containing the binary values
*/
this.hex2bin = function(hex) {
var str = '';
for (var i = 0; i < hex.length; i += 2)
str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
return str;
};
/**
* creating a hex string from an binary array of integers (0..255)
* @param [Array[integer 0..255]] array to convert

14
resources/openpgp.min.js vendored
View File

@ -58,7 +58,7 @@ BigInteger.prototype.multiply=bnMultiply;BigInteger.prototype.divide=bnDivide;Bi
function SecureRandom(){this.nextBytes=function(b){for(var a=0;a<b.length;a++)b[a]=openpgp_crypto_getSecureRandomOctet()}}
function RSA(){function b(){this.n=null;this.e=0;this.u=this.dmq1=this.dmp1=this.q=this.p=this.d=this.ee=null}this.encrypt=function(a,b,d){return a.modPowInt(b,d)};this.decrypt=function(a,b,d,e,f){var g=a.mod(d).modPow(b.mod(d.subtract(BigInteger.ONE)),d),a=a.mod(e).modPow(b.mod(e.subtract(BigInteger.ONE)),e);util.print_debug("rsa.js decrypt\nxpn:"+util.hexstrdump(g.toMPI())+"\nxqn:"+util.hexstrdump(a.toMPI()));b=a.subtract(g);0==b[0]?(b=g.subtract(a),b=b.multiply(f).mod(e),b=e.subtract(b)):b=b.multiply(f).mod(e);
return b.multiply(d).add(g)};this.verify=function(a,b,d){return a.modPowInt(b,d)};this.sign=function(a,b,d){return a.modPow(b,d)};this.generate=function(a,c){var d=new b,e=new SecureRandom,f=a>>1;d.e=parseInt(c,16);for(d.ee=new BigInteger(c,16);;){for(;!(d.p=new BigInteger(a-f,1,e),0==d.p.subtract(BigInteger.ONE).gcd(d.ee).compareTo(BigInteger.ONE)&&d.p.isProbablePrime(10)););for(;!(d.q=new BigInteger(f,1,e),0==d.q.subtract(BigInteger.ONE).gcd(d.ee).compareTo(BigInteger.ONE)&&d.q.isProbablePrime(10)););
if(0>=d.p.compareTo(d.q)){var g=d.p;d.p=d.q;d.q=g}var g=d.p.subtract(BigInteger.ONE),h=d.q.subtract(BigInteger.ONE),k=g.multiply(h);if(0==k.gcd(d.ee).compareTo(BigInteger.ONE)){d.n=d.p.multiply(d.q);d.d=d.ee.modInverse(k);d.dmp1=d.d.mod(g);d.dmq1=d.d.mod(h);d.u=d.p.modInverse(d.q);break}}return d};this.keyObject=b}function MD5(b){return md5(b)}
if(0>=d.p.compareTo(d.q)){var g=d.p;d.p=d.q;d.q=g}var g=d.p.subtract(BigInteger.ONE),h=d.q.subtract(BigInteger.ONE),k=g.multiply(h);if(0==k.gcd(d.ee).compareTo(BigInteger.ONE)){d.n=d.p.multiply(d.q);d.d=d.ee.modInverse(k);d.dmp1=d.d.mod(g);d.dmq1=d.d.mod(h);d.u=d.p.modInverse(d.q);break}}return d};this.keyObject=b}function MD5(b){b=md5(b);return util.hex2bin(b)}
function md5cycle(b,a){var c=b[0],d=b[1],e=b[2],f=b[3],c=ff(c,d,e,f,a[0],7,-680876936),f=ff(f,c,d,e,a[1],12,-389564586),e=ff(e,f,c,d,a[2],17,606105819),d=ff(d,e,f,c,a[3],22,-1044525330),c=ff(c,d,e,f,a[4],7,-176418897),f=ff(f,c,d,e,a[5],12,1200080426),e=ff(e,f,c,d,a[6],17,-1473231341),d=ff(d,e,f,c,a[7],22,-45705983),c=ff(c,d,e,f,a[8],7,1770035416),f=ff(f,c,d,e,a[9],12,-1958414417),e=ff(e,f,c,d,a[10],17,-42063),d=ff(d,e,f,c,a[11],22,-1990404162),c=ff(c,d,e,f,a[12],7,1804603682),f=ff(f,c,d,e,a[13],12,
-40341101),e=ff(e,f,c,d,a[14],17,-1502002290),d=ff(d,e,f,c,a[15],22,1236535329),c=gg(c,d,e,f,a[1],5,-165796510),f=gg(f,c,d,e,a[6],9,-1069501632),e=gg(e,f,c,d,a[11],14,643717713),d=gg(d,e,f,c,a[0],20,-373897302),c=gg(c,d,e,f,a[5],5,-701558691),f=gg(f,c,d,e,a[10],9,38016083),e=gg(e,f,c,d,a[15],14,-660478335),d=gg(d,e,f,c,a[4],20,-405537848),c=gg(c,d,e,f,a[9],5,568446438),f=gg(f,c,d,e,a[14],9,-1019803690),e=gg(e,f,c,d,a[3],14,-187363961),d=gg(d,e,f,c,a[8],20,1163531501),c=gg(c,d,e,f,a[13],5,-1444681467),
f=gg(f,c,d,e,a[2],9,-51403784),e=gg(e,f,c,d,a[7],14,1735328473),d=gg(d,e,f,c,a[12],20,-1926607734),c=hh(c,d,e,f,a[5],4,-378558),f=hh(f,c,d,e,a[8],11,-2022574463),e=hh(e,f,c,d,a[11],16,1839030562),d=hh(d,e,f,c,a[14],23,-35309556),c=hh(c,d,e,f,a[1],4,-1530992060),f=hh(f,c,d,e,a[4],11,1272893353),e=hh(e,f,c,d,a[7],16,-155497632),d=hh(d,e,f,c,a[10],23,-1094730640),c=hh(c,d,e,f,a[13],4,681279174),f=hh(f,c,d,e,a[0],11,-358537222),e=hh(e,f,c,d,a[3],16,-722521979),d=hh(d,e,f,c,a[6],23,76029189),c=hh(c,d,
@ -436,9 +436,9 @@ function openpgp_type_mpi(){this.data=this.mpiByteLength=this.mpiBitLength=this.
function openpgp_type_s2k(){this.read=function(b,a){var c=a;this.type=b[c++].charCodeAt();switch(this.type){case 0:this.hashAlgorithm=b[c++].charCodeAt();this.s2kLength=1;break;case 1:this.hashAlgorithm=b[c++].charCodeAt();this.saltValue=b.substring(c,c+8);this.s2kLength=9;break;case 3:this.hashAlgorithm=b[c++].charCodeAt();this.saltValue=b.substring(c,c+8);c+=8;this.EXPBIAS=6;c=b[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(b,a,c,d,e){this.type=b;if(3==this.type)this.saltValue=d,this.hashAlgorithm=a,this.count=16+(e&15)<<(e>>4)+6,this.s2kLength=10;return this.produce_key(c)};this.produce_key=function(b){if(0==this.type)return openpgp_crypto_hashData(this.hashAlgorithm,b);if(1==this.type)return openpgp_crypto_hashData(this.hashAlgorithm,this.saltValue+b);if(3==this.type){for(var a=this.saltValue+b;a.length<this.count;)a+=this.saltValue+b;a.length>this.count&&(a=a.substr(0,this.count));
return openpgp_crypto_hashData(this.hashAlgorithm,a)}return null}}
var Util=function(){this.hexdump=function(b){for(var a=[],c=b.length,d=0,e,f=0;d<c;){for(e=b.charCodeAt(d++).toString(16);2>e.length;)e="0"+e;a.push(" "+e);f++;0==f%32&&a.push("\n ")}return a.join("")};this.hexstrdump=function(b){if(null==b)return"";for(var a=[],c=b.length,d=0,e;d<c;){for(e=b[d++].charCodeAt().toString(16);2>e.length;)e="0"+e;a.push(""+e)}return a.join("")};this.hexidump=function(b){for(var a=[],c=b.length,d=0,e;d<c;){for(e=b[d++].toString(16);2>e.length;)e="0"+e;a.push(""+
e)}return a.join("")};this.str2bin=function(b){for(var a=[],c=0;c<b.length;c++)a[c]=b.charCodeAt(c);return a};this.bin2str=function(b){for(var a=[],c=0;c<b.length;c++)a.push(String.fromCharCode(b[c]));return a.join("")};this.calc_checksum=function(b){for(var a={s:0,add:function(a){this.s=(this.s+a)%65536}},c=0;c<b.length;c++)a.add(b.charCodeAt(c));return a.s};this.print_debug=function(b){openpgp.config.debug&&(b=openpgp_encoding_html_encode(b),showMessages('<tt><p style="background-color: #ffffff; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;">'+
b.replace(/\n/g,"<br>")+"</p></tt>"))};this.print_debug_hexstr_dump=function(b,a){openpgp.config.debug&&(b+=this.hexstrdump(a),b=openpgp_encoding_html_encode(b),showMessages('<tt><p style="background-color: #ffffff; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;">'+b.replace(/\n/g,"<br>")+"</p></tt>"))};this.print_error=function(b){b=openpgp_encoding_html_encode(b);showMessages('<p style="font-size: 80%; background-color: #FF8888; margin:0; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;"><span style="color: #888;"><b>ERROR:</b></span>\t'+
b.replace(/\n/g,"<br>")+"</p>")};this.print_info=function(b){b=openpgp_encoding_html_encode(b);showMessages('<p style="font-size: 80%; background-color: #88FF88; margin:0; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;"><span style="color: #888;"><b>INFO:</b></span>\t'+b.replace(/\n/g,"<br>")+"</p>")};this.print_warning=function(b){b=openpgp_encoding_html_encode(b);showMessages('<p style="font-size: 80%; background-color: #FFAA88; margin:0; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;"><span style="color: #888;"><b>WARNING:</b></span>\t'+
b.replace(/\n/g,"<br>")+"</p>")};this.getLeftNBits=function(b,a){var c=a%8;return 0==c?b.substring(0,a/8):this.shiftRight(b.substring(0,(a-c)/8+1),8-c)};this.shiftRight=function(b,a){var c=util.str2bin(b);if(0!=a%8)for(var d=c.length-1;0<=d;d--)c[d]>>=a%8,0<d&&(c[d]|=c[d-1]<<8-a%8&255);else return b;return util.bin2str(c)};this.get_hashAlgorithmString=function(b){switch(b){case 1:return"MD5";case 2:return"SHA1";case 3:return"RIPEMD160";case 8:return"SHA256";case 9:return"SHA384";case 10:return"SHA512";
case 11:return"SHA224"}return"unknown"}},util=new Util;
var Util=function(){this.hexdump=function(b){for(var a=[],c=b.length,d=0,e,f=0;d<c;){for(e=b.charCodeAt(d++).toString(16);2>e.length;)e="0"+e;a.push(" "+e);f++;0==f%32&&a.push("\n ")}return a.join("")};this.hexstrdump=function(b){if(null==b)return"";for(var a=[],c=b.length,d=0,e;d<c;){for(e=b[d++].charCodeAt().toString(16);2>e.length;)e="0"+e;a.push(""+e)}return a.join("")};this.hex2bin=function(b){for(var a="",c=0;c<b.length;c+=2)a+=String.fromCharCode(parseInt(b.substr(c,2),16));return a};
this.hexidump=function(b){for(var a=[],c=b.length,d=0,e;d<c;){for(e=b[d++].toString(16);2>e.length;)e="0"+e;a.push(""+e)}return a.join("")};this.str2bin=function(b){for(var a=[],c=0;c<b.length;c++)a[c]=b.charCodeAt(c);return a};this.bin2str=function(b){for(var a=[],c=0;c<b.length;c++)a.push(String.fromCharCode(b[c]));return a.join("")};this.calc_checksum=function(b){for(var a={s:0,add:function(a){this.s=(this.s+a)%65536}},c=0;c<b.length;c++)a.add(b.charCodeAt(c));return a.s};this.print_debug=function(b){openpgp.config.debug&&
(b=openpgp_encoding_html_encode(b),showMessages('<tt><p style="background-color: #ffffff; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;">'+b.replace(/\n/g,"<br>")+"</p></tt>"))};this.print_debug_hexstr_dump=function(b,a){openpgp.config.debug&&(b+=this.hexstrdump(a),b=openpgp_encoding_html_encode(b),showMessages('<tt><p style="background-color: #ffffff; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;">'+b.replace(/\n/g,"<br>")+
"</p></tt>"))};this.print_error=function(b){b=openpgp_encoding_html_encode(b);showMessages('<p style="font-size: 80%; background-color: #FF8888; margin:0; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;"><span style="color: #888;"><b>ERROR:</b></span>\t'+b.replace(/\n/g,"<br>")+"</p>")};this.print_info=function(b){b=openpgp_encoding_html_encode(b);showMessages('<p style="font-size: 80%; background-color: #88FF88; margin:0; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;"><span style="color: #888;"><b>INFO:</b></span>\t'+
b.replace(/\n/g,"<br>")+"</p>")};this.print_warning=function(b){b=openpgp_encoding_html_encode(b);showMessages('<p style="font-size: 80%; background-color: #FFAA88; margin:0; width: 652px; word-break: break-word; padding: 5px; border-bottom: 1px solid black;"><span style="color: #888;"><b>WARNING:</b></span>\t'+b.replace(/\n/g,"<br>")+"</p>")};this.getLeftNBits=function(b,a){var c=a%8;return 0==c?b.substring(0,a/8):this.shiftRight(b.substring(0,(a-c)/8+1),8-c)};this.shiftRight=function(b,a){var c=
util.str2bin(b);if(0!=a%8)for(var d=c.length-1;0<=d;d--)c[d]>>=a%8,0<d&&(c[d]|=c[d-1]<<8-a%8&255);else return b;return util.bin2str(c)};this.get_hashAlgorithmString=function(b){switch(b){case 1:return"MD5";case 2:return"SHA1";case 3:return"RIPEMD160";case 8:return"SHA256";case 9:return"SHA384";case 10:return"SHA512";case 11:return"SHA224"}return"unknown"}},util=new Util;

4
src/ciphers/hash/md5.js
View File

@ -13,7 +13,9 @@
*/
function MD5(entree) {
return md5(entree);
var hex = md5(entree);
var bin = util.hex2bin(hex);
return bin;
}
function md5cycle(x, k) {

14
src/util/util.js
View File

@ -33,6 +33,7 @@ var Util = function() {
}
return r.join('');
};
/**
* create hexstring from a binary
* @param str [String] string to convert
@ -52,6 +53,19 @@ var Util = function() {
}
return r.join('');
};
/**
* create binary string from a hex encoded string
* @param str [String] hex string to convert
* @return [String] string containing the binary values
*/
this.hex2bin = function(hex) {
var str = '';
for (var i = 0; i < hex.length; i += 2)
str += String.fromCharCode(parseInt(hex.substr(i, 2), 16));
return str;
};
/**
* creating a hex string from an binary array of integers (0..255)
* @param [Array[integer 0..255]] array to convert