From 88e7f8ec2ef3d90ca014b0bdb246f4d99f82abc8 Mon Sep 17 00:00:00 2001
From: Maximilian Krambach <maximilian.krambach@intevation.de>
Date: Wed, 20 Jun 2018 13:42:19 +0200
Subject: js: Demoextension update

--

* src/Signature: typo
* src/gpgmejs.js: fixed wrong scope in verification
* right now verify does not succeed in the DemoExtension.
  This is probably a problem in conversion or line ending.
---
 lang/js/src/Signature.js | 6 ++++--
 lang/js/src/gpgmejs.js   | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'lang/js/src')

diff --git a/lang/js/src/Signature.js b/lang/js/src/Signature.js
index d7d05983..a07fc4d1 100644
--- a/lang/js/src/Signature.js
+++ b/lang/js/src/Signature.js
@@ -35,7 +35,7 @@ export function createSignature(sigObject){
     if (
         typeof(sigObject) !=='object' ||
         !sigObject.hasOwnProperty('summary') ||
-        !sigObject.hasOwnProperty('fingerpprint') ||
+        !sigObject.hasOwnProperty('fingerprint') ||
         !sigObject.hasOwnProperty('timestamp')
         //TODO check if timestamp is mandatory in specification
     ){
@@ -67,6 +67,7 @@ export function createSignature(sigObject){
             }
         }
     }
+    console.log('sig created');
     return new GPGME_Signature(sigObject);
 }
 
@@ -178,7 +179,8 @@ const expSum = {
     'crl-missing': 'boolean',
     'crl-too-old': 'boolean',
     'bad-policy': 'boolean',
-    'sys-error': 'boolean'
+    'sys-error': 'boolean',
+    'sigsum': 'object'
 };
 
 /**
diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index a0f7e968..c2a6b8b6 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -168,7 +168,7 @@ export class GpgME {
 
     /**
      * Sign a Message
-     * @param {String|Object} data text/data to be decrypted. Accepts Strings
+     * @param {String|Object} data text/data to be signed. Accepts Strings
      * and Objects with a gettext methos
      * @param {GPGME_Key|String|Array<String>|Array<GPGME_Key>} keys The
      * key/keys to use for signing
@@ -238,7 +238,7 @@ export class GpgME {
      */
     verify(data, signature, base64 = false){
         let msg = createMessage('verify');
-        let dt = this.putData(msg, data);
+        let dt = putData(msg, data);
         if (dt instanceof Error){
             return Promise.reject(dt);
         }
@@ -317,7 +317,7 @@ function collectSignatures(sigs){
     for (let i=0; i< sigs.length; i++){
         let sigObj = createSignature(sigs[i]);
         if (sigObj instanceof Error){
-            return gpgme_error('SIG_WRONG');
+            return gpgme_error(sigObj);
         }
         if (sigObj.valid !== true){
             summary.failures += 1;
-- 
cgit v1.2.3