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

simplify selfsign and request, some stuff is already allocated.

Browse Source
This commit is contained in:
Klas Lindfors
2014-02-11 13:23:44 +01:00
parent 0bd046d88c
commit 8b0142088b
1 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yubico-piv-tool.c
+4 -22
View File
@@ -784,7 +784,6 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
const char *output_file_name, int verbose) { const char *output_file_name, int verbose) {
X509_REQ *req = NULL; X509_REQ *req = NULL;
X509_NAME *name = NULL; X509_NAME *name = NULL;
X509_ALGOR *algor = NULL;
FILE *input_file = NULL; FILE *input_file = NULL;
FILE *output_file = NULL; FILE *output_file = NULL;
EVP_PKEY *public_key = NULL; EVP_PKEY *public_key = NULL;
@@ -859,9 +858,6 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
goto request_out; goto request_out;
} }
algor = (X509_ALGOR*)sk_X509_ALGOR_new_null();
algor->parameter = (ASN1_TYPE*)sk_ASN1_TYPE_new_null();
algor->parameter->type = V_ASN1_NULL;
switch(algorithm) { switch(algorithm) {
case 0x6: case 0x6:
len = 128; len = 128;
@@ -870,10 +866,10 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
len = 256; len = 256;
} }
RSA_padding_add_PKCS1_type_1(signinput, len, digest, sizeof(digest)); RSA_padding_add_PKCS1_type_1(signinput, len, digest, sizeof(digest));
algor->algorithm = OBJ_nid2obj(NID_sha256WithRSAEncryption); req->sig_alg->algorithm = OBJ_nid2obj(NID_sha256WithRSAEncryption);
break; break;
case 0x11: case 0x11:
algor->algorithm = OBJ_nid2obj(NID_ecdsa_with_SHA256); req->sig_alg->algorithm = OBJ_nid2obj(NID_ecdsa_with_SHA256);
len = DIGEST_LEN; len = DIGEST_LEN;
memcpy(signinput, digest + sizeof(sha256oid), DIGEST_LEN); memcpy(signinput, digest + sizeof(sha256oid), DIGEST_LEN);
break; break;
@@ -882,8 +878,6 @@ static bool request_certificate(SCARDHANDLE *card, enum enum_key_format key_form
ret = false; ret = false;
goto request_out; goto request_out;
} }
req->sig_alg = algor;
req->signature = M_ASN1_BIT_STRING_new();
if(sign_data(card, signinput, len, algorithm, key, req->signature, if(sign_data(card, signinput, len, algorithm, key, req->signature,
verbose) == false) { verbose) == false) {
ret = false; ret = false;
@@ -914,9 +908,6 @@ request_out:
if(name) { if(name) {
X509_NAME_free(name); X509_NAME_free(name);
} }
if(algor) {
X509_ALGOR_free(algor);
}
return ret; return ret;
} }
@@ -929,7 +920,6 @@ static bool selfsign_certificate(SCARDHANDLE *card, enum enum_key_format key_for
EVP_PKEY *public_key = NULL; EVP_PKEY *public_key = NULL;
X509 *x509 = NULL; X509 *x509 = NULL;
X509_NAME *name = NULL; X509_NAME *name = NULL;
X509_ALGOR *algor = NULL;
unsigned char digest[DIGEST_LEN + sizeof(sha256oid)]; unsigned char digest[DIGEST_LEN + sizeof(sha256oid)];
unsigned int digest_len = DIGEST_LEN; unsigned int digest_len = DIGEST_LEN;
unsigned char algorithm; unsigned char algorithm;
@@ -1014,9 +1004,6 @@ static bool selfsign_certificate(SCARDHANDLE *card, enum enum_key_format key_for
ret = false; ret = false;
goto selfsign_out; goto selfsign_out;
} }
algor = (X509_ALGOR*)sk_X509_ALGOR_new_null();
algor->parameter = (ASN1_TYPE*)sk_ASN1_TYPE_new_null();
algor->parameter->type = V_ASN1_NULL;
switch(algorithm) { switch(algorithm) {
case 0x6: case 0x6:
len = 128; len = 128;
@@ -1025,10 +1012,10 @@ static bool selfsign_certificate(SCARDHANDLE *card, enum enum_key_format key_for
len = 256; len = 256;
} }
RSA_padding_add_PKCS1_type_1(signinput, len, digest, sizeof(digest)); RSA_padding_add_PKCS1_type_1(signinput, len, digest, sizeof(digest));
algor->algorithm = OBJ_nid2obj(NID_sha256WithRSAEncryption); x509->sig_alg->algorithm = OBJ_nid2obj(NID_sha256WithRSAEncryption);
break; break;
case 0x11: case 0x11:
algor->algorithm = OBJ_nid2obj(NID_ecdsa_with_SHA256); x509->sig_alg->algorithm = OBJ_nid2obj(NID_ecdsa_with_SHA256);
len = DIGEST_LEN; len = DIGEST_LEN;
memcpy(signinput, digest + sizeof(sha256oid), DIGEST_LEN); memcpy(signinput, digest + sizeof(sha256oid), DIGEST_LEN);
break; break;
@@ -1037,8 +1024,6 @@ static bool selfsign_certificate(SCARDHANDLE *card, enum enum_key_format key_for
ret = false; ret = false;
goto selfsign_out; goto selfsign_out;
} }
x509->sig_alg = algor;
x509->signature = M_ASN1_BIT_STRING_new();
if(sign_data(card, signinput, len, algorithm, key, x509->signature, if(sign_data(card, signinput, len, algorithm, key, x509->signature,
verbose) == false) { verbose) == false) {
ret = false; ret = false;
@@ -1069,9 +1054,6 @@ selfsign_out:
if(name) { if(name) {
X509_NAME_free(name); X509_NAME_free(name);
} }
if(algor) {
X509_ALGOR_free(algor);
}
return ret; return ret;
} }