#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)
{
return s-d;
}
-static unsigned char *ustrsep(char **string ,const char *delim)
+static char *sstrsep(char **string, const char *delim)
{
char isdelim[256];
char *token = *string;
isdelim[0] = 1;
while (*delim)
- {
+ {
isdelim[(unsigned char)(*delim)] = 1;
delim++;
- }
+ }
while (!isdelim[(unsigned char)(**string)])
- {
- while (!isdelim[(unsigned char)(**string)])
- {
- (*string)++;
- }
+ {
+ (*string)++;
+ }
- if (**string)
- {
- **string = 0;
- (*string)++;
- }
+ if (**string)
+ {
+ **string = 0;
+ (*string)++;
+ }
- return token;
- }
+ return token;
}
+static unsigned char *ustrsep(char **p,const char *sep)
+ { return (unsigned char *)sstrsep((char **)p,sep); }
+
static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn,
const unsigned char *iv,int in,
const unsigned char *plaintext,int pn,
c->key_len);
exit(5);
}
-
- if(!EVP_EncryptInit(&ctx,c,key,iv))
+ EVP_CIPHER_CTX_init(&ctx);
+ if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
{
fprintf(stderr,"EncryptInit failed\n");
exit(10);
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);
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);
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);
const unsigned char *ciphertext,int cn)
{
const EVP_CIPHER *c;
- ENGINE *e;
c=EVP_get_cipherbyname(cipher);
if(!c)
test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);
- for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))
- {
- c=ENGINE_get_cipher_by_name(e,cipher);
- if(!c)
- continue;
- printf("Testing engine %s\n",ENGINE_get_name(e));
-
- test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);
- }
-
return 1;
}
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;
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);
fprintf(stderr,"DigestUpdate failed\n");
exit(101);
}
- if(!EVP_DigestFinal(&ctx,md,&mdn))
+ if(!EVP_DigestFinal_ex(&ctx,md,&mdn))
{
- fprintf(stderr,"DigestUpdate failed\n");
+ fprintf(stderr,"DigestFinal failed\n");
exit(101);
}
+ EVP_MD_CTX_cleanup(&ctx);
if(mdn != cn)
{
fprintf(stderr,"%s <test file>\n",argv[0]);
exit(1);
}
+ CRYPTO_malloc_debug_init();
+ CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+ CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
szTestFile=argv[1];
exit(2);
}
+ /* Load up the software EVP_CIPHER and EVP_MD definitions */
OpenSSL_add_all_ciphers();
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();
+ ENGINE_register_all_digests();
+ /* If we add command-line options, this statement should be switchable.
+ * It'll prevent ENGINEs being ENGINE_init()ialised for cipher/digest use if
+ * they weren't already initialised. */
+ /* ENGINE_set_cipher_flags(ENGINE_CIPHER_FLAG_NOINIT); */
for( ; ; )
{
if(line[0] == '#' || line[0] == '\n')
continue;
p=line;
- cipher=strsep(&p,":");
+ cipher=sstrsep(&p,":");
key=ustrsep(&p,":");
iv=ustrsep(&p,":");
plaintext=ustrsep(&p,":");
}
}
+ ENGINE_cleanup();
+ EVP_cleanup();
+ CRYPTO_cleanup_all_ex_data();
+ ERR_remove_state(0);
+ ERR_free_strings();
+ CRYPTO_mem_leaks_fp(stderr);
return 0;
}