aboutsummaryrefslogtreecommitdiffstats
path: root/lang/js/src/permittedOperations.js
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-04-25 09:32:21 +0000
committerMaximilian Krambach <[email protected]>2018-04-25 09:32:21 +0000
commit5befa1c9751fe54b5ae87906d7f09772ce9de6ea (patch)
tree07d5b2dd1f97c88d42cc5bf723be464ec97403cd /lang/js/src/permittedOperations.js
parentjs: change in Error behaviour (diff)
downloadgpgme-5befa1c9751fe54b5ae87906d7f09772ce9de6ea.tar.gz
gpgme-5befa1c9751fe54b5ae87906d7f09772ce9de6ea.zip
js: reactivate timeout on connection
-- * A timeout of 5 seconds is activated for functions that do not require a pinentry. This definition is written to src/permittedOperations.js * testapplication.js now alerts the proper error codes and messages. * src/Errors.js fixed two typos in error handling
Diffstat (limited to 'lang/js/src/permittedOperations.js')
-rw-r--r--lang/js/src/permittedOperations.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/lang/js/src/permittedOperations.js b/lang/js/src/permittedOperations.js
index 3c11b8e0..892f4f2e 100644
--- a/lang/js/src/permittedOperations.js
+++ b/lang/js/src/permittedOperations.js
@@ -23,6 +23,8 @@
* operation: <Object>
required: Array<String>
optional: Array<String>
+ pinentry: Boolean If a pinentry dialog is expected, and a timeout of
+ 5000 ms would be too short
answer: <Object>
type: <String< The content type of answer expected
data: Array<String> The payload property of the answer. May be
@@ -59,6 +61,7 @@ export const permittedOperations = {
},
decrypt: {
+ pinentry: true,
required: ['data'],
optional: [
'protocol',