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

Merge branch 'master' of github.com:openpgpjs/openpgpjs into HEAD

Browse Source 
Conflicts:
	resources/openpgp.js
	resources/openpgp.min.js
This commit is contained in:
Sean Colyer 2012-07-30 20:48:10 -04:00
commit a82b075a01
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/openpgp.js
View File

@ -10256,7 +10256,7 @@ function openpgp_config() {
keyserver: "keyserver.linux.it" // "pgp.mit.edu:11371"
};
this.versionstring ="OpenPGP.js v0.1";
this.versionstring ="OpenPGP.js 20120730";
this.commentstring ="http://openpgpjs.org";
/**
* reads the config out of the HTML5 local storage
@ -14381,6 +14381,7 @@ function openpgp_msg_message() {
/**
* Verifies a message signature. This function can be called after read_message if the message was signed only.
* @param pubkey [openpgp_msg_publickey] Array of public keys to check signature against. If not provided, checks local keystore.
* @return [boolean] true if the signature was correct; otherwise false
*/
function verifySignature(pubkey) {

2
resources/openpgp.min.js vendored
View File

@ -392,7 +392,7 @@ return this.len=a-c};this.write=function(){};this.toString=function(){for(var a=
this.subKeys.length;b++)a+=" "+this.subKeys[b].toString();return a};this.validate=function(){for(var a=0;a<this.revocationSignatures.length;a++)if(this.revocationSignatures[a].verify(this.publicKeyPacket.header+this.publicKeyPacket.data,this.publicKeyPacket))return!1;if(0!=this.subKeys.length){for(var b=!1,a=0;a<this.subKeys.length;a++)if(3==this.subKeys[a].verifyKey()){b=!0;break}if(!b)return!1}b=!1;for(a=0;a<this.userIds.length;a++)if(0==this.userIds[a].verify(this.publicKeyPacket)){b=!0;break}return!b?
!1:!0};this.getFingerprint=function(){return this.publicKeyPacket.getFingerprint()};this.getKeyId=function(){return this.publicKeyPacket.getKeyId()};this.verifyBasicSignatures=function(){for(var a=0;a<this.revocationSignatures.length;)return this.revocationSignatures[a].verify(this.publicKeyPacket.header+this.publicKeyPacket.data,this.publicKeyPacket),!1;if(0!=this.subKeys.length){for(var b=!1,a=0;a<this.subKeys.length;a++)if(null!=this.subKeys[a]&&3==this.subKeys[a].verifyKey()){b=!0;break}if(!b)return!1}b=
this.getKeyId();for(a=0;a<this.userIds.length;a++)for(var c=0;c<this.userIds[a].certificationRevocationSignatures.length;c++)if(this.userIds[a].certificationSignatures[c].getIssuer==b&&4!=this.userIds[a].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 v0.1";this.commentstring="http://openpgpjs.org";this.debug=!1;this.read=function(){var a=JSON.parse(window.localStorage.getItem("config"));null==a?(this.config=this.default_config,this.write()):this.config=a};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 20120730";this.commentstring="http://openpgpjs.org";this.debug=!1;this.read=function(){var a=JSON.parse(window.localStorage.getItem("config"));null==a?(this.config=this.default_config,this.write()):this.config=a};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.getSigningKey=function(){if((17==this.privateKeyPacket.publicKey.publicKeyAlgorithm||2!=this.privateKeyPacket.publicKey.publicKeyAlgorithm)&&3==this.privateKeyPacket.publicKey.verifyKey())return this.privateKeyPacket;if(4==this.privateKeyPacket.publicKey.version)for(var a=0;a<this.privateKeyPacket.subKeys.length;a++)if((17==this.privateKeyPacket.subKeys[a].publicKey.publicKeyAlgorithm||
2!=this.privateKeyPacket.subKeys[a].publicKey.publicKeyAlgorithm)&&3==this.privateKeyPacket.subKeys[a].publicKey.verifyKey())return this.privateKeyPacket.subKeys[a];return null};this.getFingerprint=function(){return this.privateKeyPacket.publicKey.getFingerprint()};this.getPreferredSignatureHashAlgorithm=function(){var a=this.getSigningKey();return null==a?(util.print_error("private key is for encryption only! Cannot create a signature."),null):17==a.publicKey.publicKeyAlgorithm?(new DSA).select_hash_algorithm(a.publicKey.MPIs[1].toBigInteger()):

5
scripts/minimize.sh
View File

@ -2,6 +2,7 @@
echo "Setup..."
_src="src";
_tmp="resources/openpgp.js.tmp";
_raw="resources/openpgp.js";
_min="resources/openpgp.min.js";
_compiler="resources/compiler.jar";
@ -9,7 +10,9 @@ _compiler="resources/compiler.jar";
:>"$_min"
echo "Concatenating..."
find "$_src" -name "*.js" -exec cat "{}" >> "$_raw" \;
find "$_src" -name "*.js" -exec cat "{}" >> "$_tmp" \;
sed "s/OpenPGP.js VERSION/OpenPGP.js $(date +%Y%m%d)/g" "$_tmp" > "$_raw";
rm "$_tmp";
echo "Minimizing..."
java -jar "$_compiler" --js "$_raw" --js_output_file "$_min"

2
src/config/openpgp.config.js
View File

@ -44,7 +44,7 @@ function openpgp_config() {
keyserver: "keyserver.linux.it" // "pgp.mit.edu:11371"
};
this.versionstring ="OpenPGP.js v0.1";
this.versionstring ="OpenPGP.js VERSION";
this.commentstring ="http://openpgpjs.org";
/**
* reads the config out of the HTML5 local storage

1
src/openpgp.msg.message.js
View File

@ -98,6 +98,7 @@ function openpgp_msg_message() {
/**
* Verifies a message signature. This function can be called after read_message if the message was signed only.
* @param pubkey [openpgp_msg_publickey] Array of public keys to check signature against. If not provided, checks local keystore.
* @return [boolean] true if the signature was correct; otherwise false
*/
function verifySignature(pubkey) {