adapt return codes

client/src/crypto/asn1utils.c

@@ -12,18 +12,16 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <mbedtls/asn1.h>
-
 #include "ui.h"  // Print...
-
 #include "emv/tlv.h"
 #include "asn1dump.h"
 #include "util.h"
 
 int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *rval, uint8_t *sval) {
     if (!signature || !signaturelen || !rval || !sval)
-        return 1;
+        return PM3_EINVARG;
 
-    int res = 0;
+    int res = PM3_SUCCESS;
     unsigned char *p = signature;
     const unsigned char *end = p + signaturelen;
     size_t len;
@@ -56,7 +54,7 @@ int ecdsa_asn1_get_signature(uint8_t *signature, size_t signaturelen, uint8_t *r
 
         // check size
         if (end != p)
-            return 2;
+            return PM3_ESOFT;
     }
 
 exit:
@@ -79,10 +77,10 @@ int asn1_print(uint8_t *asn1buf, size_t asn1buflen, const char *indent) {
         tlvdb_free(t);
     } else {
         PrintAndLogEx(ERR, "Can't parse data as TLV tree");
-        return 1;
+        return PM3_ESOFT;
     }
 
-    return 0;
+    return PM3_SUCCESS;
 }
 
 

client/src/crypto/libpcrypto.c

@@ -418,7 +418,7 @@ int ecdsa_nist_test(bool verbose) {
     // make signature
     res = ecdsa_signature_create_test(curveid, T_PRIVATE_KEY, T_Q_X, T_Q_Y, T_K, input, length, signature, &siglen);
 // PrintAndLogEx(INFO, "res: %x signature[%x]: %s", (res < 0)? -res : res, siglen, sprint_hex(signature, siglen));
-    if (res)
+    if (res != PM3_SUCCESS)
         goto exit;
 
     // check vectors
@@ -483,7 +483,7 @@ int ecdsa_nist_test(bool verbose) {
     if (verbose)
         PrintAndLogEx(NORMAL, _GREEN_("passed\n"));
 
-    return 0;
+    return PM3_SUCCESS;
 exit:
     if (verbose)
         PrintAndLogEx(NORMAL, _RED_("failed\n"));