Constification, add config to /dev/crypto.

[openssl.git] / crypto / evp / evp_test.c

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index da34c47bedb5d81acc1ba813bc3a439c4adf1621..ae14356dfeabefffb8f7463177ccd927650dd3cf 100644 (file)
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -51,6 +51,7 @@
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/engine.h>
+#include <openssl/conf.h>
 
 static void hexdump(FILE *f,const char *title,const unsigned char *s,int l)
     {
@@ -142,7 +143,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
        exit(5);
        }
     EVP_CIPHER_CTX_init(&ctx);
-    if(!EVP_EncryptInit(&ctx,c,key,iv))
+    if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
        {
        fprintf(stderr,"EncryptInit failed\n");
        exit(10);
@@ -154,7 +155,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
        fprintf(stderr,"Encrypt failed\n");
        exit(6);
        }
-    if(!EVP_EncryptFinal(&ctx,out+outl,&outl2))
+    if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
        {
        fprintf(stderr,"EncryptFinal failed\n");
        exit(7);
@@ -175,7 +176,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
        exit(9);
        }
 
-    if(!EVP_DecryptInit(&ctx,c,key,iv))
+    if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
        {
        fprintf(stderr,"DecryptInit failed\n");
        exit(11);
@@ -187,7 +188,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
        fprintf(stderr,"Decrypt failed\n");
        exit(6);
        }
-    if(!EVP_DecryptFinal(&ctx,out+outl,&outl2))
+    if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
        {
        fprintf(stderr,"DecryptFinal failed\n");
        exit(7);
@@ -229,7 +230,7 @@ static int test_cipher(const char *cipher,const unsigned char *key,int kn,
 
 static int test_digest(const char *digest,
                       const unsigned char *plaintext,int pn,
-                      const unsigned char *ciphertext, int cn)
+                      const unsigned char *ciphertext, unsigned int cn)
     {
     const EVP_MD *d;
     EVP_MD_CTX ctx;
@@ -245,7 +246,7 @@ static int test_digest(const char *digest,
     hexdump(stdout,"Digest",ciphertext,cn);
 
     EVP_MD_CTX_init(&ctx);
-    if(!EVP_DigestInit(&ctx,d))
+    if(!EVP_DigestInit_ex(&ctx,d, NULL))
        {
        fprintf(stderr,"DigestInit failed\n");
        exit(100);
@@ -255,7 +256,7 @@ static int test_digest(const char *digest,
        fprintf(stderr,"DigestUpdate failed\n");
        exit(101);
        }
-    if(!EVP_DigestFinal(&ctx,md,&mdn))
+    if(!EVP_DigestFinal_ex(&ctx,md,&mdn))
        {
        fprintf(stderr,"DigestFinal failed\n");
        exit(101);
@@ -309,6 +310,7 @@ int main(int argc,char **argv)
     OpenSSL_add_all_digests();
     /* Load all compiled-in ENGINEs */
     ENGINE_load_builtin_engines();
+    OPENSSL_config();
     /* Register all available ENGINE implementations of ciphers and digests.
      * This could perhaps be changed to "ENGINE_register_all_complete()"? */
     ENGINE_register_all_ciphers();