aboutsummaryrefslogtreecommitdiff
path: root/demos/maurice/loadkeys.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2001-09-28 01:48:34 +0000
committerDr. Stephen Henson <steve@openssl.org>2001-09-28 01:48:34 +0000
commitcb7fd76f572c6535856e882a6e9225163a45d977 (patch)
treec5dcde8d0ce9bd3a7d5f24f370f4934b8f9db9f4 /demos/maurice/loadkeys.c
parentde822715b2a7af12844d408b6d2f5f0b655d54bb (diff)
downloadopenssl-cb7fd76f572c6535856e882a6e9225163a45d977.zip
openssl-cb7fd76f572c6535856e882a6e9225163a45d977.tar.gz
openssl-cb7fd76f572c6535856e882a6e9225163a45d977.tar.bz2
Modernise and fix (ancient) "maurice" demos.
Diffstat (limited to 'demos/maurice/loadkeys.c')
-rw-r--r--demos/maurice/loadkeys.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/demos/maurice/loadkeys.c b/demos/maurice/loadkeys.c
index 0f34647..82fd22a 100644
--- a/demos/maurice/loadkeys.c
+++ b/demos/maurice/loadkeys.c
@@ -31,9 +31,7 @@ EVP_PKEY * ReadPublicKey(const char *certfile)
if (!fp)
return NULL;
- x509 = (X509 *)PEM_ASN1_read ((char *(*)())d2i_X509,
- PEM_STRING_X509,
- fp, NULL, NULL);
+ x509 = PEM_read_X509(fp, NULL, 0, NULL);
if (x509 == NULL)
{
@@ -61,10 +59,7 @@ EVP_PKEY *ReadPrivateKey(const char *keyfile)
if (!fp)
return NULL;
- pkey = (EVP_PKEY*)PEM_ASN1_read ((char *(*)())d2i_PrivateKey,
- PEM_STRING_EVP_PKEY,
- fp,
- NULL, NULL);
+ pkey = PEM_read_PrivateKey(fp, NULL, 0, NULL);
fclose (fp);