fixed json secret key export (now export the whole encrypted blob, since only that blob is being used to parse the key). added support to import json secret keys

include/pcp/mgmt.h

@@ -271,6 +271,7 @@ json_t *pcp_sk2json(pcp_key_t *sk, byte *sig,size_t siglen);
 json_t *pcp_pk2json(pcp_pubkey_t *pk);
 
 pcp_ks_bundle_t *pcp_import_pub_json(PCPCTX *ptx, byte *raw, size_t rawsize);
+Buffer *pcp_import_secret_json(PCPCTX *ptx, Buffer *json);
 
 #endif
 

libpcp/mgmt.c

@@ -656,36 +656,27 @@ Buffer *pcp_export_secret(PCPCTX *ptx, pcp_key_t *sk, char *passphrase) {
   buffer_add(raw, sk->secret, 32);
   buffer_add(raw, sk->edsecret, 64);
 
-#ifdef HAVE_JSON
+  buffer_add(raw, sk->masterpub, 32);
-  if(! ptx->json) {
+  buffer_add(raw, sk->pub, 32);
-    /* only encrypt everything if exporting in native format */
+  buffer_add(raw, sk->edpub, 32);
-#endif
 
-    buffer_add(raw, sk->masterpub, 32);
+  if(strlen(sk->owner) > 0) {
-    buffer_add(raw, sk->pub, 32);
+    buffer_add16be(raw, strlen(sk->owner));
-    buffer_add(raw, sk->edpub, 32);
+    buffer_add(raw, sk->owner,  strlen(sk->owner));
-
-    if(strlen(sk->owner) > 0) {
-      buffer_add16be(raw, strlen(sk->owner));
-      buffer_add(raw, sk->owner,  strlen(sk->owner));
-    }
-    else
-      buffer_add16be(raw, 0);
-
-    if(strlen(sk->mail) > 0) {
-      buffer_add16be(raw, strlen(sk->mail));
-      buffer_add(raw, sk->mail, strlen(sk->mail));
-    }
-    else
-      buffer_add16be(raw, 0);
-
-    buffer_add64be(raw, sk->ctime);
-    buffer_add32be(raw, sk->version);
-    buffer_add32be(raw, sk->serial);
-
-#ifdef HAVE_JSON
   }
-#endif
+  else
+    buffer_add16be(raw, 0);
+  
+  if(strlen(sk->mail) > 0) {
+    buffer_add16be(raw, strlen(sk->mail));
+    buffer_add(raw, sk->mail, strlen(sk->mail));
+  }
+  else
+    buffer_add16be(raw, 0);
+  
+  buffer_add64be(raw, sk->ctime);
+  buffer_add32be(raw, sk->version);
+  buffer_add32be(raw, sk->serial);
   
   nonce = ucmalloc(crypto_secretbox_NONCEBYTES);
   arc4random_buf(nonce, crypto_secretbox_NONCEBYTES);
@@ -769,6 +760,16 @@ pcp_key_t *pcp_import_secret_native(PCPCTX *ptx, Buffer *cipher, char *passphras
   uint16_t notationlen = 0;
 
   Buffer *blob = buffer_new(512, "secretdecryptbuf");
+  
+#ifdef HAVE_JSON
+  if(ptx->json) {
+    Buffer *parsed = pcp_import_secret_json(ptx, cipher);
+    if(parsed == NULL) {
+      goto impserr1;
+    }
+    cipher = parsed; /* re-used */
+  }
+#endif
 
   if(buffer_get_chunk(cipher, nonce, crypto_secretbox_NONCEBYTES) == 0)
     goto impserr1;
@@ -954,7 +955,7 @@ Buffer *pcp_export_json_secret(PCPCTX *ptx, pcp_key_t *sk, byte *nonce, byte *ci
   jdump  = json_dumps(jout, JSON_INDENT(4) | JSON_PRESERVE_ORDER);
 
   if(jdump != NULL) {
-    buffer_add_str(b, jdump);
+    buffer_add(b, jdump, strlen(jdump));
     free(jdump);
   }
   else {
@@ -990,6 +991,57 @@ Buffer *pcp_export_json_pub(PCPCTX *ptx, pcp_key_t *sk, byte *sig, size_t siglen
   return b;
 }
 
+Buffer *pcp_import_secret_json(PCPCTX *ptx, Buffer *json) {
+  json_error_t jerror;
+  json_t *jtmp, *jin;
+  size_t maxblob = 2048;
+  size_t binlen;
+  char *hexerr = "failed to decode hex string";
+  
+  jin = json_loadb((char *)buffer_get(json), buffer_size(json), JSON_DISABLE_EOF_CHECK, &jerror);
+  if(jin == NULL)
+    goto jirr1;
+
+  byte *blob = ucmalloc(maxblob);
+  /* re-use the buffer */
+  json->end = 0;
+  json->offset = 0;
+
+  jtmp = json_object_get(jin, "nonce");
+  if(jtmp == NULL)
+    goto jirr2;
+  binlen = _hex2bin(json_string_value(jtmp), blob, maxblob);
+  if(binlen > 1)
+    buffer_add(json, blob, binlen);
+  else {
+    strcpy(jerror.text, hexerr);
+    goto jirr2;
+  }
+  
+  jtmp = json_object_get(jin, "secrets");
+  if(jtmp == NULL)
+    goto jirr2;
+  binlen = _hex2bin(json_string_value(jtmp), blob, maxblob);
+  if(binlen > 1)
+    buffer_add(json, blob, binlen);
+  else {
+    strcpy(jerror.text, hexerr);
+    goto jirr2;
+  }
+  
+  json_decref(jin);
+  ucfree(blob, maxblob);
+  return json;
+  
+ jirr2:
+  ucfree(blob, maxblob);
+  json_decref(jin);
+  
+ jirr1:
+  fatal(ptx, "JSON decoding error: %s", jerror.text);
+  return NULL;
+}
+
 pcp_ks_bundle_t *pcp_import_pub_json(PCPCTX *ptx, byte *raw, size_t rawsize) {
   pcp_ks_bundle_t *b = NULL;
   pcp_keysig_t *s = NULL;
@@ -1137,7 +1189,6 @@ pcp_ks_bundle_t *pcp_import_pub_json(PCPCTX *ptx, byte *raw, size_t rawsize) {
   
  jerr1:
   fatal(ptx, "JSON decoding error: %s", jerror.text);
-  fprintf(stderr,  "JSON decoding error: %s\n", jerror.text);
   return NULL;
 }
 #endif

tests/jsonunittests.cfg

@@ -35,6 +35,14 @@ include keys.cfg
     cmd = cat testkeyvjapub.json
     expect = /"Alicia"/
   </test>
+  <test check-json-export-secret>
+    cmd = $pcp -V vja -s -j -x a -O testkeyvjasec.json
+    expect-file testkeyvjasec.json
+  </test>
+  <test check-json-export-secret-isjson>
+    cmd = cat testkeyvjasec.json
+    expect = /"Alicia"/
+  </test>
 </test>
 
 <test vjb>
@@ -43,6 +51,21 @@ include keys.cfg
     cmd = $pcp -V vjb -K -I testkeyvjapub.json -j
     expect /added/
   </test>
+  <test check-json-import-public-open>
+    cmd = $pcp -V vjb -l
+    expect = /Alicia/
+  </test>
+</test>
+
+<test vjc>
+  <test check-json-import-secret>
+    cmd = $pcp -V vjc -K -I testkeyvjasec.json -x a -j
+    expect = /added/
+  </test>
+  <test check-json-import-secret-open>
+    cmd = $pcp -V vjc -l
+    expect = /Alicia/
+  </test>
 </test>
 
 <test vjtxt>