From cb7fd76f572c6535856e882a6e9225163a45d977 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Fri, 28 Sep 2001 01:48:34 +0000 Subject: Modernise and fix (ancient) "maurice" demos. --- demos/maurice/example1.c | 2 +- demos/maurice/loadkeys.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'demos') diff --git a/demos/maurice/example1.c b/demos/maurice/example1.c index 0e70523..4890b69 100644 --- a/demos/maurice/example1.c +++ b/demos/maurice/example1.c @@ -130,7 +130,7 @@ void main_decrypt(void) char ebuf[512]; unsigned int buflen; EVP_CIPHER_CTX ectx; - unsigned char iv[8]; + unsigned char iv[EVP_MAX_IV_LENGTH]; unsigned char *encryptKey; unsigned int ekeylen; EVP_PKEY *privateKey; 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); -- cgit v1.1