X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=demos%2Fmaurice%2Floadkeys.c;h=82fd22a950369c02aad71c0977e3c16a22c7bad5;hp=7c89f071f353f9741b096e978ce8f0046f231563;hb=cb7fd76f572c6535856e882a6e9225163a45d977;hpb=eda1f21f1af8b6f77327e7b37573af9c1ba73726

diff --git a/demos/maurice/loadkeys.c b/demos/maurice/loadkeys.c
index 7c89f071f3..82fd22a950 100644
--- a/demos/maurice/loadkeys.c
+++ b/demos/maurice/loadkeys.c
@@ -14,13 +14,13 @@
 #include <strings.h>
 #include <stdlib.h>
 
-#include "rsa.h"
-#include "evp.h"
-#include "objects.h"
-#include "x509.h"
-#include "err.h"
-#include "pem.h"
-#include "ssl.h"
+#include <openssl/rsa.h>
+#include <openssl/evp.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/err.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
 
 EVP_PKEY * ReadPublicKey(const char *certfile)
 {
@@ -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);