james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

handle generation of ecc keys

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-04 15:02:11 +01:00
parent 79527ed21f
commit d6d8c8fc41
1 changed files with 58 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+58 -11
View File
@@ -35,6 +35,7 @@
#include <openssl/des.h> #include <openssl/des.h>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/pkcs12.h> #include <openssl/pkcs12.h>
#include <openssl/ec.h>
#ifdef __APPLE__ #ifdef __APPLE__
#include <PCSC/wintypes.h> #include <PCSC/wintypes.h>
@@ -242,6 +243,11 @@ static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorith
FILE *output_file; FILE *output_file;
bool ret = true; bool ret = true;
EVP_PKEY *public_key = NULL; EVP_PKEY *public_key = NULL;
RSA *rsa = NULL;
BIGNUM *bignum_n = NULL;
BIGNUM *bignum_e = NULL;
EC_KEY *eckey = NULL;
EC_POINT *point = NULL;
sscanf(slot, "%x", &key); sscanf(slot, "%x", &key);
@@ -302,8 +308,7 @@ static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorith
if(algorithm == algorithm_arg_RSA1024 || algorithm == algorithm_arg_RSA2048) { if(algorithm == algorithm_arg_RSA1024 || algorithm == algorithm_arg_RSA2048) {
unsigned char *data_ptr = data + 5; unsigned char *data_ptr = data + 5;
int len; int len;
RSA *rsa = RSA_new(); rsa = RSA_new();
BIGNUM *n, *e;
if(*data_ptr != 0x81) { if(*data_ptr != 0x81) {
fprintf(stderr, "Failed to parse public key structure.\n"); fprintf(stderr, "Failed to parse public key structure.\n");
@@ -313,8 +318,8 @@ static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorith
data_ptr++; data_ptr++;
len = get_length(data_ptr); len = get_length(data_ptr);
data_ptr += get_length_bytes(len); data_ptr += get_length_bytes(len);
n = BN_bin2bn(data_ptr, len, NULL); bignum_n = BN_bin2bn(data_ptr, len, NULL);
if(n == NULL) { if(bignum_n == NULL) {
fprintf(stderr, "Failed to parse public key modulus.\n"); fprintf(stderr, "Failed to parse public key modulus.\n");
ret = false; ret = false;
goto generate_out; goto generate_out;
@@ -329,19 +334,46 @@ static bool generate_key(SCARDHANDLE *card, const char *slot, enum enum_algorith
data_ptr++; data_ptr++;
len = get_length(data_ptr); len = get_length(data_ptr);
data_ptr += get_length_bytes(len); data_ptr += get_length_bytes(len);
e = BN_bin2bn(data_ptr, len, NULL); bignum_e = BN_bin2bn(data_ptr, len, NULL);
if(e == NULL) { if(bignum_e == NULL) {
fprintf(stderr, "Failed to parse public key exponent.\n"); fprintf(stderr, "Failed to parse public key exponent.\n");
ret = false; ret = false;
goto generate_out; goto generate_out;
} }
rsa->n = n; rsa->n = bignum_n;
rsa->e = e; rsa->e = bignum_e;
EVP_PKEY_assign_RSA(public_key, rsa); EVP_PKEY_set1_RSA(public_key, rsa);
} else if(algorithm == algorithm_arg_ECCP256) {
const EC_GROUP *group;
unsigned char *data_ptr = data + 3;
eckey = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
group = EC_KEY_get0_group(eckey);
point = EC_POINT_new(group);
if(*data_ptr++ != 0x86) {
fprintf(stderr, "Failed to parse public key structure.\n");
ret = false;
goto generate_out;
}
if(*data_ptr++ != 65) { /* the curve point should always be 65 bytes */
fprintf(stderr, "Unexpected length.\n");
ret = false;
goto generate_out;
}
if(!EC_POINT_oct2point(group, point, data_ptr, 65, NULL)) {
fprintf(stderr, "Failed to load public point.\n");
ret = false;
goto generate_out;
}
if(!EC_KEY_set_public_key(eckey, point)) {
fprintf(stderr, "Failed to set the public key.\n");
ret = false;
goto generate_out;
}
EVP_PKEY_set1_EC_KEY(public_key, eckey);
} else { } else {
/* TODO: ECC pubkey out */ fprintf(stderr, "Wrong algorithm.\n");
fprintf(stderr, "only RSA gets an output..\n");
ret = false; ret = false;
goto generate_out; goto generate_out;
} }
@@ -359,6 +391,21 @@ generate_out:
if(public_key) { if(public_key) {
EVP_PKEY_free(public_key); EVP_PKEY_free(public_key);
} }
if(rsa) {
RSA_free(rsa);
}
if(bignum_n) {
BN_free(bignum_n);
}
if(bignum_e) {
BN_free(bignum_e);
}
if(eckey) {
EC_KEY_free(eckey);
}
if(point) {
EC_POINT_free(point);
}
return ret; return ret;
} }