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

refactor so we get algorithm from a function.

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-06 09:54:29 +01:00
parent be9211dc5b
commit 71cb66e5bf
1 changed files with 113 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+55 -20
View File
@@ -87,6 +87,7 @@ static int send_data(SCARDHANDLE*, APDU*, unsigned int, unsigned char*, unsigned
static int set_length(unsigned char*, int);
static int get_length(unsigned char*, int *);
static X509_NAME *parse_name(char*);
static unsigned char get_algorithm(EVP_PKEY*);
static bool connect_reader(SCARDHANDLE *card, SCARDCONTEXT *context, const char *wanted, int verbose) {
unsigned long num_readers;
@@ -534,22 +535,14 @@ static bool import_key(SCARDHANDLE *card, enum enum_key_format key_format,
}
{
int type = EVP_PKEY_type(private_key->type);
if(type == EVP_PKEY_RSA) {
int algorithm;
RSA *rsa_private_key = EVP_PKEY_get1_RSA(private_key);
int size = RSA_size(rsa_private_key);
if(size == 256) {
algorithm = 7;
} else if(size == 128) {
algorithm = 6;
} else {
fprintf(stderr, "Unuseable key of %d bits, only 1024 and 2048 is supported.\n", size * 8);
unsigned char algorithm = get_algorithm(private_key);
if(algorithm == 11) {
fprintf(stderr, "import key only supports RSA.\n");
ret = false;
goto import_out;
} else if(algorithm == 0) {
ret = false;
goto import_out;
}
if(verbose) {
fprintf(stderr, "Found RSA-%d key.\n", size * 8);
}
{
APDU apdu;
@@ -557,6 +550,7 @@ static bool import_key(SCARDHANDLE *card, enum enum_key_format key_format,
unsigned char *in_ptr = in_data;
int sw;
int in_size;
RSA *rsa_private_key = EVP_PKEY_get1_RSA(private_key);
*in_ptr++ = 0x01;
in_ptr += set_length(in_ptr, BN_num_bytes(rsa_private_key->p));
@@ -608,12 +602,6 @@ static bool import_key(SCARDHANDLE *card, enum enum_key_format key_format,
in_ptr += this_size;
}
}
} else {
/* TODO: ECC */
fprintf(stderr, "Unknown type: %d\n", type);
ret = false;
}
}
import_out:
if(private_key) {
@@ -825,6 +813,7 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
X509_ALGOR algor;
unsigned char digest[20];
unsigned int digest_len = sizeof(digest);
unsigned char algorithm;
if(!strcmp(input_file_name, "-")) {
input_file = stdin;
@@ -857,6 +846,8 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
ret = false;
goto request_out;
}
algorithm = get_algorithm(public_key);
req = X509_REQ_new();
if(!req) {
fprintf(stderr, "Failed to allocate request structure.\n");
@@ -900,6 +891,16 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
dump_hex(digest, digest_len);
fprintf(stderr, "\n");
}
{
APDU apdu;
unsigned char data[0xff];
unsigned long recv_len = sizeof(data);
int sw;
memset(apdu.raw, 0, sizeof(apdu.raw));
apdu.st.ins = 0x87;
apdu.st.p1 = algorithm;
}
request_out:
if(input_file != stdin) {
@@ -920,6 +921,40 @@ request_out:
return ret;
}
static unsigned char get_algorithm(EVP_PKEY *key) {
int type = EVP_PKEY_type(key->type);
switch(type) {
case EVP_PKEY_RSA:
{
RSA *rsa = EVP_PKEY_get1_RSA(key);
int size = RSA_size(rsa);
if(size == 256) {
return 7;
} else if(size == 128) {
return 6;
} else {
fprintf(stderr, "Unuseable key of %d bits, only 1024 and 2048 is supported.\n", size * 8);
return 0;
}
}
case EVP_PKEY_EC:
{
EC_KEY *ec = EVP_PKEY_get1_EC_KEY(key);
const EC_GROUP *group = EC_KEY_get0_group(ec);
int curve = EC_GROUP_get_curve_name(group);
if(curve == NID_X9_62_prime256v1) {
return 11;
} else {
fprintf(stderr, "Unknown EC curve %d\n", curve);
return 0;
}
}
default:
fprintf(stderr, "Unknown algorithm %d.\n", type);
return 0;
}
}
static X509_NAME *parse_name(char *name) {
X509_NAME *parsed = NULL;
char *ptr = name;