Commit cb7fd76f authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Modernise and fix (ancient) "maurice" demos.

parent de822715

demos/maurice/example1.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

demos/maurice/loadkeys.c

+2 −7
Original line number Diff line number Diff line
@@ -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);