diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2001-09-28 01:48:34 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2001-09-28 01:48:34 +0000 |
| commit | cb7fd76f572c6535856e882a6e9225163a45d977 (patch) | |
| tree | c5dcde8d0ce9bd3a7d5f24f370f4934b8f9db9f4 /demos/maurice | |
| parent | de822715b2a7af12844d408b6d2f5f0b655d54bb (diff) | |
| download | openssl-cb7fd76f572c6535856e882a6e9225163a45d977.tar.gz | |
Modernise and fix (ancient) "maurice" demos.
Diffstat (limited to 'demos/maurice')
| -rw-r--r-- | demos/maurice/example1.c | 2 | ||||
| -rw-r--r-- | demos/maurice/loadkeys.c | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/demos/maurice/example1.c b/demos/maurice/example1.c index 0e70523a33..4890b69ce5 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 0f3464753a..82fd22a950 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); |