Commit 4897dc40 authored by Ben Laurie's avatar Ben Laurie
Browse files

Test digests.

parent 35e33f0e

crypto/evp/evp.h

+3 −0
Original line number Diff line number Diff line
@@ -377,6 +377,8 @@ typedef int (EVP_PBE_KEYGEN)(EVP_CIPHER_CTX *ctx, const char *pass, int passlen, 
#define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))



#define EVP_MD_type(e)			((e)->type)

#define EVP_MD_nid(e)			EVP_MD_type(e)

#define EVP_MD_name(e)			OBJ_nid2sn(EVP_MD_nid(e))

#define EVP_MD_pkey_type(e)		((e)->pkey_type)

#define EVP_MD_size(e)			((e)->md_size)

#define EVP_MD_block_size(e)		((e)->block_size)
@@ -559,6 +561,7 @@ const EVP_CIPHER *EVP_desx_cbc(void); 
# ifdef OPENSSL_OPENBSD_DEV_CRYPTO

const EVP_CIPHER *EVP_dev_crypto_des_ede3_cbc(void);

const EVP_CIPHER *EVP_dev_crypto_rc4(void);

const EVP_MD *EVP_dev_crypto_md5(void);

# endif

#endif

#ifndef OPENSSL_NO_RC4

crypto/evp/evp_test.c

+86 −20
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, 
    hexdump(stdout,"Plaintext",plaintext,pn);

    hexdump(stdout,"Ciphertext",ciphertext,cn);

    

    

    if(kn != c->key_len)

	{

	fprintf(stderr,"Key length doesn't match, got %d expected %d\n",kn,
@@ -148,7 +147,7 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, 
    if(!EVP_DecryptInit(&ctx,c,key,iv))

	{

	fprintf(stderr,"DecryptInit failed\n");

	exit(10);

	exit(11);

	}

    EVP_CIPHER_CTX_set_padding(&ctx,0);
@@ -181,6 +180,86 @@ static void test1(const EVP_CIPHER *c,const unsigned char *key,int kn, 
    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 EVP_CIPHER *c;

    ENGINE *e;



    c=EVP_get_cipherbyname(cipher);

    if(!c)

	return 0;



    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 EVP_MD *d;

    EVP_MD_CTX ctx;

    unsigned char md[EVP_MAX_MD_SIZE];

    unsigned int mdn;



    d=EVP_get_digestbyname(digest);

    if(!d)

	return 0;



    printf("Testing digest %s\n",EVP_MD_name(d));

    hexdump(stdout,"Plaintext",plaintext,pn);

    hexdump(stdout,"Digest",ciphertext,cn);



    EVP_MD_CTX_init(&ctx);

    if(!EVP_DigestInit(&ctx,d))

	{

	fprintf(stderr,"DigestInit failed\n");

	exit(100);

	}

    if(!EVP_DigestUpdate(&ctx,plaintext,pn))

	{

	fprintf(stderr,"DigestUpdate failed\n");

	exit(101);

	}

    if(!EVP_DigestFinal(&ctx,md,&mdn))

	{

	fprintf(stderr,"DigestUpdate failed\n");

	exit(101);

	}



    if(mdn != cn)

	{

	fprintf(stderr,"Digest length mismatch, got %d expected %d\n",mdn,cn);

	exit(102);

	}



    if(memcmp(md,ciphertext,cn))

	{

	fprintf(stderr,"Digest mismatch\n");

	hexdump(stderr,"Got",md,cn);

	hexdump(stderr,"Expected",ciphertext,cn);

	exit(103);

	}



    printf("\n");



    return 1;

    }



int main(int argc,char **argv)

    {

    const char *szTestFile;
@@ -202,6 +281,7 @@ int main(int argc,char **argv) 
	}



    OpenSSL_add_all_ciphers();

    OpenSSL_add_all_digests();

    ENGINE_load_builtin_engines();



    for( ; ; )
@@ -210,9 +290,7 @@ int main(int argc,char **argv) 
	char *p;

	char *cipher;

	unsigned char *iv,*key,*plaintext,*ciphertext;

	const EVP_CIPHER *c;

	int kn,in,pn,cn;

	ENGINE *e;



	if(!fgets((char *)line,sizeof line,f))

	    break;
@@ -225,28 +303,16 @@ int main(int argc,char **argv) 
	plaintext=ustrsep(&p,":");

	ciphertext=ustrsep(&p,"\n");



	c=EVP_get_cipherbyname(cipher);

	if(!c)

	    {

	    fprintf(stderr,"Can't find cipher %s!\n",cipher);

	    exit(3);

	    }



	kn=convert(key);

	in=convert(iv);

	pn=convert(plaintext);

	cn=convert(ciphertext);



	test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn);



	for(e=ENGINE_get_first() ; e ; e=ENGINE_get_next(e))

	if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn)

	   && !test_digest(cipher,plaintext,pn,ciphertext,cn))

	    {

	    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);

	    fprintf(stderr,"Can't find %s\n",cipher);

	    exit(3);

	    }

	}

crypto/evp/evptests.txt

+11 −1
Original line number Diff line number Diff line 
#cipher:key:iv:input:output

#digest:::input:output



# MD5 tests (from md5test.c)

MD5::::d41d8cd98f00b204e9800998ecf8427e

MD5:::61:0cc175b9c0f1b6a831c399e269772661

MD5:::616263:900150983cd24fb0d6963f7d28e17f72

MD5:::6d65737361676520646967657374:f96b697d7cb7938d525a2f31aaf161d0

MD5:::6162636465666768696a6b6c6d6e6f707172737475767778797a:c3fcd3d76192e4007dfb496cca67e13b

MD5:::4142434445464748494a4b4c4d4e4f505152535455565758595a6162636465666768696a6b6c6d6e6f707172737475767778797a30313233343536373839:d174ab98d277d9f5a5611c2c9f419d9f

MD5:::3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930:57edf4a22be3c955ac49da2e2107b67a



# AES 128 ECB tests (from NIST test vectors, encrypt)



AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F

#AES-128-ECB:00000000000000000000000000000000::00000000000000000000000000000000:C34C052CC0DA8D73451AFE5F03BE297F



# AES 128 ECB tests (from NIST test vectors, decrypt)