RDV4.0 Smartcard Slot Firmware Upgrade (#751)

[proxmark3-svn] / client / crypto / libpcrypto.c

diff --git a/client/crypto/libpcrypto.c b/client/crypto/libpcrypto.c
index 030be15a32383af1f0642ddb143561a4d305cd49..ebc1e987ba78eb19203a749bf22a858168e7fafd 100644 (file)
--- a/client/crypto/libpcrypto.c
+++ b/client/crypto/libpcrypto.c
@@ -16,8 +16,10 @@
 #include <mbedtls/asn1.h>
 #include <mbedtls/aes.h>
 #include <mbedtls/cmac.h>
+#include <mbedtls/pk.h>
 #include <mbedtls/ecdsa.h>
 #include <mbedtls/sha256.h>
+#include <mbedtls/sha512.h>
 #include <mbedtls/ctr_drbg.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/error.h>
@@ -105,6 +107,20 @@ int sha256hash(uint8_t *input, int length, uint8_t *hash) {
        return 0;
 }
 
+int sha512hash(uint8_t *input, int length, uint8_t *hash) {
+       if (!hash || !input)
+               return 1;
+       
+       mbedtls_sha512_context sctx;
+       mbedtls_sha512_init(&sctx);
+       mbedtls_sha512_starts(&sctx, 0); //SHA-512, not 384
+       mbedtls_sha512_update(&sctx, input, length);
+       mbedtls_sha512_finish(&sctx, hash);     
+       mbedtls_sha512_free(&sctx);
+       
+       return 0;
+}
+
 int ecdsa_init_str(mbedtls_ecdsa_context *ctx, char * key_d, char *key_x, char *key_y) {
        if (!ctx)
                return 1;
@@ -208,6 +224,31 @@ char *ecdsa_get_error(int ret) {
        return retstr;
 }
 
+int ecdsa_public_key_from_pk(mbedtls_pk_context *pk, uint8_t *key, size_t keylen) {
+       int res = 0;
+       size_t realkeylen = 0;
+       if (keylen < 65) 
+               return 1;
+       
+       mbedtls_ecdsa_context ctx;
+       mbedtls_ecdsa_init(&ctx);
+       
+       res = mbedtls_ecp_group_load(&ctx.grp, MBEDTLS_ECP_DP_SECP256R1); // secp256r1
+       if (res)
+               goto exit;
+       
+       res = mbedtls_ecdsa_from_keypair(&ctx, mbedtls_pk_ec(*pk) );
+       if (res)
+               goto exit;
+       
+       res = mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_UNCOMPRESSED, &realkeylen, key, keylen);
+       if (realkeylen != 65)
+               res = 2;
+exit:
+       mbedtls_ecdsa_free(&ctx);
+       return res;
+}
+
 int ecdsa_signature_create(uint8_t *key_d, uint8_t *key_xy, uint8_t *input, int length, uint8_t *signature, size_t *signaturelen) {
        int res;
        *signaturelen = 0;