Merge branch 'master' of alias.fr.nf:alias

1 files changed, 15 insertions, 3 deletions

diff --git a/webclient/lib/alias.js b/webclient/lib/alias.js
index c19d025..78fc4f4 100644
--- a/webclient/lib/alias.js
+++ b/webclient/lib/alias.js
@@ -40,7 +40,9 @@ var Alias = {
             privkey = JSON.parse(privkey);
             var rsa = new RSAKey();
             rsa.setPublic(pubkey.n, pubkey.e);
-            rsa.setPrivate(pubkey.n, pubkey.e, privkey.d);
+            rsa.setPrivateEx(pubkey.n, pubkey.e, privkey.d,
+                             privkey.p, privkey.q, privkey.dp,
+                             privkey.dq, privkey.c);
             this.rsa = rsa;
       }
         else{
@@ -54,8 +56,18 @@ var Alias = {
             $('#generate').click(function(){
                 var rsa = new RSAKey();
                 rsa.generate(1024, "10001");
-                var pubkey = {n: rsa.n.toString(16), e: rsa.e.toString(16)};
-                var privkey = {d: rsa.d.toString(16)};
+                var pubkey = {
+                    n: rsa.n.toString(16),
+                    e: rsa.e.toString(16)
+                };
+                var privkey = {
+                    d: rsa.d.toString(16),
+                    p: rsa.p.toString(16),
+                    q: rsa.q.toString(16),
+                    dp: rsa.dmp1.toString(16),
+                    dq: rsa.dmq1.toString(16),
+                    c: rsa.coeff.toString(16)
+                };
                 privkey = sjcl.encrypt(Alias.connection.pass, JSON.stringify(privkey));
                 $("#form-pubkey").val(JSON.stringify(pubkey));
                 $("#form-privkey").val(privkey);