harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #320 from dawnbreak/master

Browse Source 
Let user cancel the red_encrypt dialogue
This commit is contained in:
friendica 2014-02-19 12:01:34 +11:00
commit 2e305742fa
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
view/js/crypto.js
View File

@ -1,5 +1,4 @@
function str_rot13 (str) { function str_rot13 (str) {
// http://kevin.vanzonneveld.net // http://kevin.vanzonneveld.net
// + original by: Jonas Raoni Soares Silva (http://www.jsfromhell.com) // + original by: Jonas Raoni Soares Silva (http://www.jsfromhell.com)
@ -43,7 +42,11 @@ function red_encrypt(alg, elem,text) {
// key and hint need to be localised // key and hint need to be localised
var enc_key = bin2hex(prompt(aStr['passphrase'])); var passphrase = prompt(aStr['passphrase']);
// let the user cancel this dialogue
if (passphrase == null)
return false;
var enc_key = bin2hex(passphrase);
// If you don't provide a key you get rot13, which doesn't need a key // If you don't provide a key you get rot13, which doesn't need a key
// but consequently isn't secure. // but consequently isn't secure.