#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)
{
for(d=s ; *s ; s+=2,++d)
{
- int n;
+ unsigned int n;
if(!s[1])
{
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,
- const unsigned char *ciphertext,int cn)
+ const unsigned char *ciphertext,int cn,
+ int encdec)
{
EVP_CIPHER_CTX ctx;
unsigned char out[4096];
int outl,outl2;
- printf("Testing cipher %s\n",EVP_CIPHER_name(c));
+ printf("Testing cipher %s%s\n",EVP_CIPHER_name(c),
+ (encdec == 1 ? "(encrypt)" : (encdec == 0 ? "(decrypt)" : "(encrypt/decrypt)")));
hexdump(stdout,"Key",key,kn);
if(in)
hexdump(stdout,"IV",iv,in);
exit(5);
}
EVP_CIPHER_CTX_init(&ctx);
- if(!EVP_EncryptInit(&ctx,c,key,iv))
- {
- fprintf(stderr,"EncryptInit failed\n");
- exit(10);
- }
- EVP_CIPHER_CTX_set_padding(&ctx,0);
+ if (encdec != 0)
+ {
+ if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
+ {
+ fprintf(stderr,"EncryptInit failed\n");
+ exit(10);
+ }
+ EVP_CIPHER_CTX_set_padding(&ctx,0);
- if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
- {
- fprintf(stderr,"Encrypt failed\n");
- exit(6);
- }
- if(!EVP_EncryptFinal(&ctx,out+outl,&outl2))
- {
- fprintf(stderr,"EncryptFinal failed\n");
- exit(7);
- }
+ if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
+ {
+ fprintf(stderr,"Encrypt failed\n");
+ exit(6);
+ }
+ if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
+ {
+ fprintf(stderr,"EncryptFinal failed\n");
+ exit(7);
+ }
- if(outl+outl2 != cn)
- {
- fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
- outl+outl2,cn);
- exit(8);
- }
+ if(outl+outl2 != cn)
+ {
+ fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
+ outl+outl2,cn);
+ exit(8);
+ }
- if(memcmp(out,ciphertext,cn))
- {
- fprintf(stderr,"Ciphertext mismatch\n");
- hexdump(stderr,"Got",out,cn);
- hexdump(stderr,"Expected",ciphertext,cn);
- exit(9);
+ if(memcmp(out,ciphertext,cn))
+ {
+ fprintf(stderr,"Ciphertext mismatch\n");
+ hexdump(stderr,"Got",out,cn);
+ hexdump(stderr,"Expected",ciphertext,cn);
+ exit(9);
+ }
}
- if(!EVP_DecryptInit(&ctx,c,key,iv))
- {
- fprintf(stderr,"DecryptInit failed\n");
- exit(11);
- }
- EVP_CIPHER_CTX_set_padding(&ctx,0);
+ if (encdec <= 0)
+ {
+ if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
+ {
+ fprintf(stderr,"DecryptInit failed\n");
+ exit(11);
+ }
+ EVP_CIPHER_CTX_set_padding(&ctx,0);
- if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,pn))
- {
- fprintf(stderr,"Decrypt failed\n");
- exit(6);
- }
- if(!EVP_DecryptFinal(&ctx,out+outl,&outl2))
- {
- fprintf(stderr,"DecryptFinal failed\n");
- exit(7);
- }
+ if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
+ {
+ fprintf(stderr,"Decrypt failed\n");
+ exit(6);
+ }
+ if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
+ {
+ fprintf(stderr,"DecryptFinal failed\n");
+ exit(7);
+ }
- if(outl+outl2 != cn)
- {
- fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
- outl+outl2,cn);
- exit(8);
- }
+ if(outl+outl2 != cn)
+ {
+ fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
+ outl+outl2,cn);
+ exit(8);
+ }
- if(memcmp(out,plaintext,cn))
- {
- fprintf(stderr,"Plaintext mismatch\n");
- hexdump(stderr,"Got",out,cn);
- hexdump(stderr,"Expected",plaintext,cn);
- exit(9);
+ if(memcmp(out,plaintext,cn))
+ {
+ fprintf(stderr,"Plaintext mismatch\n");
+ hexdump(stderr,"Got",out,cn);
+ hexdump(stderr,"Expected",plaintext,cn);
+ exit(9);
+ }
}
+ EVP_CIPHER_CTX_cleanup(&ctx);
+
printf("\n");
}
static int test_cipher(const char *cipher,const unsigned char *key,int kn,
const unsigned char *iv,int in,
const unsigned char *plaintext,int pn,
- const unsigned char *ciphertext,int cn)
+ const unsigned char *ciphertext,int cn,
+ int encdec)
{
const EVP_CIPHER *c;
if(!c)
return 0;
- test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);
+ test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
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,"DigestFinal failed\n");
exit(101);
printf("\n");
+ EVP_MD_CTX_cleanup(&ctx);
+
return 1;
}
OpenSSL_add_all_digests();
/* Load all compiled-in ENGINEs */
ENGINE_load_builtin_engines();
+#if 0
+ OPENSSL_config();
+#endif
+ /* 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( ; ; )
{
char *p;
char *cipher;
unsigned char *iv,*key,*plaintext,*ciphertext;
+ int encdec;
int kn,in,pn,cn;
if(!fgets((char *)line,sizeof line,f))
key=ustrsep(&p,":");
iv=ustrsep(&p,":");
plaintext=ustrsep(&p,":");
- ciphertext=ustrsep(&p,"\n");
+ ciphertext=ustrsep(&p,":");
+ if (p[-1] == '\n') {
+ p[-1] = '\0';
+ encdec = -1;
+ } else {
+ encdec = atoi(ustrsep(&p,"\n"));
+ }
+
kn=convert(key);
in=convert(iv);
pn=convert(plaintext);
cn=convert(ciphertext);
- if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn)
+ if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
&& !test_digest(cipher,plaintext,pn,ciphertext,cn))
{
fprintf(stderr,"Can't find %s\n",cipher);
projects / openssl.git / blobdiff