EVP support for wrapping algorithms.

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

diff --git a/crypto/evp/evp_test.c b/crypto/evp/evp_test.c
index bc15348f5ee67715694bc5c400bcd8980a7350ea..ad36b846403e9ce47ef26c1914c9d3c41f141eeb 100644 (file)
--- a/crypto/evp/evp_test.c
+++ b/crypto/evp/evp_test.c
@@ -164,6 +164,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
        test1_exit(5);
        }
     EVP_CIPHER_CTX_init(&ctx);
+    EVP_CIPHER_CTX_set_flags(&ctx,EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
     if (encdec != 0)
         {
        if (mode == EVP_CIPH_GCM_MODE)
@@ -232,6 +233,15 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
                test1_exit(13);
                }
            }
+       else if (mode == EVP_CIPH_WRAP_MODE)
+           {
+           if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,in ? iv : NULL))
+               {
+               fprintf(stderr,"EncryptInit failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(10);
+               }
+           }
        else if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
            {
            fprintf(stderr,"EncryptInit failed\n");
@@ -363,6 +373,15 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
                test1_exit(13);
                }
            }
+       else if (mode == EVP_CIPH_WRAP_MODE)
+           {
+           if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,in ? iv : NULL))
+               {
+               fprintf(stderr,"EncryptInit failed\n");
+               ERR_print_errors_fp(stderr);
+               test1_exit(10);
+               }
+           }
        else if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
            {
            fprintf(stderr,"DecryptInit failed\n");
@@ -505,7 +524,7 @@ int main(int argc,char **argv)
        perror(szTestFile);
        EXIT(2);
        }
-
+    ERR_load_crypto_strings();
     /* Load up the software EVP_CIPHER and EVP_MD definitions */
     OpenSSL_add_all_ciphers();
     OpenSSL_add_all_digests();