more EC bits, now parses the private key

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@24661 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2009-02-09 17:16:32 +00:00
parent 647dde211f
commit 0f2af8c10f

View File

@@ -284,10 +284,8 @@ struct pem_formats {
const AlgorithmIdentifier *(*ai)(void); const AlgorithmIdentifier *(*ai)(void);
} formats[] = { } formats[] = {
{ "CERTIFICATE", parse_certificate, NULL }, { "CERTIFICATE", parse_certificate, NULL },
{ "RSA PRIVATE KEY", parse_private_key, hx509_signature_rsa } { "RSA PRIVATE KEY", parse_private_key, hx509_signature_rsa },
#if 0 { "EC PRIVATE KEY", parse_private_key, hx509_signature_ecPublicKey }
{ "EC PRIVATE KEY", parse_private_key, hx509_signature_rsa } /* XXX */
#endif
}; };
@@ -306,6 +304,7 @@ pem_func(hx509_context context, const char *type,
for (j = 0; j < sizeof(formats)/sizeof(formats[0]); j++) { for (j = 0; j < sizeof(formats)/sizeof(formats[0]); j++) {
const char *q = formats[j].name; const char *q = formats[j].name;
printf("matching %s with %s\n", type, q);
if (strcasecmp(type, q) == 0) { if (strcasecmp(type, q) == 0) {
const AlgorithmIdentifier *ai = NULL; const AlgorithmIdentifier *ai = NULL;
if (formats[j].ai != NULL) if (formats[j].ai != NULL)