KNF.

1 files changed, 296 insertions, 324 deletions

diff --git a/regress/lib/libcrypto/evp/evptest.c b/regress/lib/libcrypto/evp/evptest.c
index de1bcce41d1..c88bf130cdf 100644
--- a/regress/lib/libcrypto/evp/evptest.c
+++ b/regress/lib/libcrypto/evp/evptest.c
@@ -7,7 +7,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    notice, this list of conditions and the following disclaimer.
  *
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in
@@ -58,398 +58,370 @@
 #include <openssl/err.h>
 #include <openssl/conf.h>
 
-static void hexdump(FILE *f,const char *title,const unsigned char *s,int l)
-    {
-    int n=0;
+static void
+hexdump(FILE *f, const char *title, const unsigned char *s, int l)
+{
+	int n = 0;
 
-    fprintf(f,"%s",title);
-    for( ; n < l ; ++n)
-	{
-	if((n%16) == 0)
-	    fprintf(f,"\n%04x",n);
-	fprintf(f," %02x",s[n]);
+	fprintf(f, "%s",title);
+	for (; n < l; ++n) {
+		if ((n % 16) == 0)
+			fprintf(f, "\n%04x",n);
+		fprintf(f, " %02x",s[n]);
 	}
-    fprintf(f,"\n");
-    }
-
-static int convert(unsigned char *s)
-    {
-    unsigned char *d;
-
-    for(d=s ; *s ; s+=2,++d)
-	{
-	unsigned int n;
-
-	if(!s[1])
-	    {
-	    fprintf(stderr,"Odd number of hex digits!");
-	    exit(4);
-	    }
-	sscanf((char *)s,"%2x",&n);
-	*d=(unsigned char)n;
-	}
-    return s-d;
-    }
-
-static char *sstrsep(char **string, const char *delim)
-    {
-    char isdelim[256];
-    char *token = *string;
-
-    if (**string == 0)
-        return NULL;
+	fprintf(f, "\n");
+}
 
-    memset(isdelim, 0, 256);
-    isdelim[0] = 1;
+static int
+convert(unsigned char *s)
+{
+	unsigned char *d;
 
-    while (*delim)
-        {
-        isdelim[(unsigned char)(*delim)] = 1;
-        delim++;
-        }
+	for (d = s; *s; s += 2,++d) {
+		unsigned int n;
 
-    while (!isdelim[(unsigned char)(**string)])
-        {
-        (*string)++;
-        }
+		if (!s[1]) {
+			fprintf(stderr, "Odd number of hex digits!");
+			exit(4);
+		}
+		sscanf((char *)s, "%2x",&n);
+		*d = (unsigned char)n;
+	}
+	return s - d;
+}
 
-    if (**string)
-        {
-        **string = 0;
-        (*string)++;
-        }
+static char *
+sstrsep(char **string, const char *delim)
+{
+	char isdelim[256];
+	char *token = *string;
 
-    return token;
-    }
+	if (**string == 0)
+		return NULL;
 
-static unsigned char *ustrsep(char **p,const char *sep)
-    { return (unsigned char *)sstrsep(p,sep); }
+	memset(isdelim, 0, 256);
+	isdelim[0] = 1;
 
-static int test1_exit(int ec)
-	{
-	exit(ec);
-	return(0);		/* To keep some compilers quiet */
+	while (*delim) {
+		isdelim[(unsigned char)(*delim)] = 1;
+		delim++;
 	}
 
-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,
-		  int encdec)
-    {
-    EVP_CIPHER_CTX ctx;
-    unsigned char out[4096];
-    int outl,outl2;
-
-    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);
-    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 %lu\n",kn,
-		(unsigned long)c->key_len);
-	test1_exit(5);
-	}
-    EVP_CIPHER_CTX_init(&ctx);
-    if (encdec != 0)
-        {
-	if(!EVP_EncryptInit_ex(&ctx,c,NULL,key,iv))
-	    {
-	    fprintf(stderr,"EncryptInit failed\n");
-	    ERR_print_errors_fp(stderr);
-	    test1_exit(10);
-	    }
-	EVP_CIPHER_CTX_set_padding(&ctx,0);
-
-	if(!EVP_EncryptUpdate(&ctx,out,&outl,plaintext,pn))
-	    {
-	    fprintf(stderr,"Encrypt failed\n");
-	    ERR_print_errors_fp(stderr);
-	    test1_exit(6);
-	    }
-	if(!EVP_EncryptFinal_ex(&ctx,out+outl,&outl2))
-	    {
-	    fprintf(stderr,"EncryptFinal failed\n");
-	    ERR_print_errors_fp(stderr);
-	    test1_exit(7);
-	    }
-
-	if(outl+outl2 != cn)
-	    {
-	    fprintf(stderr,"Ciphertext length mismatch got %d expected %d\n",
-		    outl+outl2,cn);
-	    test1_exit(8);
-	    }
-
-	if(memcmp(out,ciphertext,cn))
-	    {
-	    fprintf(stderr,"Ciphertext mismatch\n");
-	    hexdump(stderr,"Got",out,cn);
-	    hexdump(stderr,"Expected",ciphertext,cn);
-	    test1_exit(9);
-	    }
+	while (!isdelim[(unsigned char)(**string)]) {
+		(*string)++;
 	}
 
-    if (encdec <= 0)
-        {
-	if(!EVP_DecryptInit_ex(&ctx,c,NULL,key,iv))
-	    {
-	    fprintf(stderr,"DecryptInit failed\n");
-	    ERR_print_errors_fp(stderr);
-	    test1_exit(11);
-	    }
-	EVP_CIPHER_CTX_set_padding(&ctx,0);
-
-	if(!EVP_DecryptUpdate(&ctx,out,&outl,ciphertext,cn))
-	    {
-	    fprintf(stderr,"Decrypt failed\n");
-	    ERR_print_errors_fp(stderr);
-	    test1_exit(6);
-	    }
-	if(!EVP_DecryptFinal_ex(&ctx,out+outl,&outl2))
-	    {
-	    fprintf(stderr,"DecryptFinal failed\n");
-	    ERR_print_errors_fp(stderr);
-	    test1_exit(7);
-	    }
-
-	if(outl+outl2 != pn)
-	    {
-	    fprintf(stderr,"Plaintext length mismatch got %d expected %d\n",
-		    outl+outl2,pn);
-	    test1_exit(8);
-	    }
-
-	if(memcmp(out,plaintext,pn))
-	    {
-	    fprintf(stderr,"Plaintext mismatch\n");
-	    hexdump(stderr,"Got",out,pn);
-	    hexdump(stderr,"Expected",plaintext,pn);
-	    test1_exit(9);
-	    }
+	if (**string) {
+		**string = 0;
+		(*string)++;
 	}
 
-    EVP_CIPHER_CTX_cleanup(&ctx);
+	return token;
+}
 
-    printf("\n");
-    }
+static unsigned char *
+ustrsep(char **p, const char *sep)
+{
+	return (unsigned char *)sstrsep(p, sep);
+}
 
-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,
-		       int encdec)
-    {
-    const EVP_CIPHER *c;
+static int
+test1_exit(int ec)
+{
+	exit(ec);
+	return(0);		/* To keep some compilers quiet */
+}
+
+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, int encdec)
+{
+	EVP_CIPHER_CTX ctx;
+	unsigned char out[4096];
+	int outl, outl2;
+
+	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);
+	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 %lu\n",kn,
+		    (unsigned long)c->key_len);
+		test1_exit(5);
+	}
+	EVP_CIPHER_CTX_init(&ctx);
+	if (encdec != 0) {
+		if (!EVP_EncryptInit_ex(&ctx, c,NULL, key, iv)) {
+			fprintf(stderr, "EncryptInit failed\n");
+			ERR_print_errors_fp(stderr);
+			test1_exit(10);
+		}
+		EVP_CIPHER_CTX_set_padding(&ctx, 0);
 
-    c=EVP_get_cipherbyname(cipher);
-    if(!c)
-	return 0;
+		if (!EVP_EncryptUpdate(&ctx, out, &outl, plaintext, pn)) {
+			fprintf(stderr, "Encrypt failed\n");
+			ERR_print_errors_fp(stderr);
+			test1_exit(6);
+		}
+		if (!EVP_EncryptFinal_ex(&ctx, out + outl, &outl2)) {
+			fprintf(stderr, "EncryptFinal failed\n");
+			ERR_print_errors_fp(stderr);
+			test1_exit(7);
+		}
 
-    test1(c,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec);
+		if (outl + outl2 != cn) {
+			fprintf(stderr, "Ciphertext length mismatch got %d expected %d\n",
+			    outl + outl2, cn);
+			test1_exit(8);
+		}
+
+		if (memcmp(out, ciphertext, cn)) {
+			fprintf(stderr, "Ciphertext mismatch\n");
+			hexdump(stderr, "Got",out,cn);
+			hexdump(stderr, "Expected",ciphertext,cn);
+			test1_exit(9);
+		}
+	}
 
-    return 1;
-    }
+	if (encdec <= 0) {
+		if (!EVP_DecryptInit_ex(&ctx, c,NULL, key, iv)) {
+			fprintf(stderr, "DecryptInit failed\n");
+			ERR_print_errors_fp(stderr);
+			test1_exit(11);
+		}
+		EVP_CIPHER_CTX_set_padding(&ctx, 0);
 
-static int test_digest(const char *digest,
-		       const unsigned char *plaintext,int pn,
-		       const unsigned char *ciphertext, unsigned int cn)
-    {
-    const EVP_MD *d;
-    EVP_MD_CTX ctx;
-    unsigned char md[EVP_MAX_MD_SIZE];
-    unsigned int mdn;
+		if (!EVP_DecryptUpdate(&ctx, out, &outl, ciphertext, cn)) {
+			fprintf(stderr, "Decrypt failed\n");
+			ERR_print_errors_fp(stderr);
+			test1_exit(6);
+		}
+		if (!EVP_DecryptFinal_ex(&ctx, out + outl, &outl2)) {
+			fprintf(stderr, "DecryptFinal failed\n");
+			ERR_print_errors_fp(stderr);
+			test1_exit(7);
+		}
 
-    d=EVP_get_digestbyname(digest);
-    if(!d)
-	return 0;
+		if (outl + outl2 != pn) {
+			fprintf(stderr, "Plaintext length mismatch got %d expected %d\n",
+			    outl + outl2, pn);
+			test1_exit(8);
+		}
 
-    printf("Testing digest %s\n",EVP_MD_name(d));
-    hexdump(stdout,"Plaintext",plaintext,pn);
-    hexdump(stdout,"Digest",ciphertext,cn);
+		if (memcmp(out, plaintext, pn)) {
+			fprintf(stderr, "Plaintext mismatch\n");
+			hexdump(stderr, "Got",out,pn);
+			hexdump(stderr, "Expected",plaintext,pn);
+			test1_exit(9);
+		}
+	}
 
-    EVP_MD_CTX_init(&ctx);
-    if(!EVP_DigestInit_ex(&ctx,d, NULL))
-	{
-	fprintf(stderr,"DigestInit failed\n");
-	ERR_print_errors_fp(stderr);
-	exit(100);
+	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, int encdec)
+{
+	const EVP_CIPHER *c;
+
+	c = EVP_get_cipherbyname(cipher);
+	if (!c)
+		return 0;
+
+	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, unsigned 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_ex(&ctx, d, NULL)) {
+		fprintf(stderr, "DigestInit failed\n");
+		ERR_print_errors_fp(stderr);
+		exit(100);
 	}
-    if(!EVP_DigestUpdate(&ctx,plaintext,pn))
-	{
-	fprintf(stderr,"DigestUpdate failed\n");
-	ERR_print_errors_fp(stderr);
-	exit(101);
+	if (!EVP_DigestUpdate(&ctx, plaintext, pn)) {
+		fprintf(stderr, "DigestUpdate failed\n");
+		ERR_print_errors_fp(stderr);
+		exit(101);
 	}
-    if(!EVP_DigestFinal_ex(&ctx,md,&mdn))
-	{
-	fprintf(stderr,"DigestFinal failed\n");
-	ERR_print_errors_fp(stderr);
-	exit(101);
+	if (!EVP_DigestFinal_ex(&ctx, md, &mdn)) {
+		fprintf(stderr, "DigestFinal failed\n");
+		ERR_print_errors_fp(stderr);
+		exit(101);
 	}
-    EVP_MD_CTX_cleanup(&ctx);
+	EVP_MD_CTX_cleanup(&ctx);
 
-    if(mdn != cn)
-	{
-	fprintf(stderr,"Digest length mismatch, got %d expected %d\n",mdn,cn);
-	exit(102);
+	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);
+	if (memcmp(md, ciphertext, cn)) {
+		fprintf(stderr, "Digest mismatch\n");
+		hexdump(stderr, "Got",md,cn);
+		hexdump(stderr, "Expected",ciphertext,cn);
+		exit(103);
 	}
 
-    printf("\n");
+	printf("\n");
 
-    EVP_MD_CTX_cleanup(&ctx);
+	EVP_MD_CTX_cleanup(&ctx);
 
-    return 1;
-    }
+	return 1;
+}
 
-int main(int argc,char **argv)
-    {
-    const char *szTestFile;
-    FILE *f;
+int
+main(int argc, char **argv)
+{
+	const char *szTestFile;
+	FILE *f;
 
-    if(argc != 2)
-	{
-	fprintf(stderr,"%s <test file>\n",argv[0]);
-	exit(1);
+	if (argc != 2) {
+		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);
+	CRYPTO_malloc_debug_init();
+	CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
+	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
-    szTestFile=argv[1];
+	szTestFile = argv[1];
 
-    f=fopen(szTestFile,"r");
-    if(!f)
-	{
-	perror(szTestFile);
-	exit(2);
+	f=fopen(szTestFile, "r");
+	if (!f) {
+		perror(szTestFile);
+		exit(2);
 	}
 
-    /* Load up the software EVP_CIPHER and EVP_MD definitions */
-    OpenSSL_add_all_ciphers();
-    OpenSSL_add_all_digests();
+	/* Load up the software EVP_CIPHER and EVP_MD definitions */
+	OpenSSL_add_all_ciphers();
+	OpenSSL_add_all_digests();
 #ifndef OPENSSL_NO_ENGINE
-    /* Load all compiled-in ENGINEs */
-    ENGINE_load_builtin_engines();
+	/* Load all compiled-in ENGINEs */
+	ENGINE_load_builtin_engines();
 #endif
 #if 0
-    OPENSSL_config();
+	OPENSSL_config();
 #endif
 #ifndef OPENSSL_NO_ENGINE
     /* 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();
+	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); */
+	/* ENGINE_set_cipher_flags(ENGINE_CIPHER_FLAG_NOINIT); */
 #endif
 
-    for( ; ; )
-	{
-	char line[4096];
-	char *p;
-	char *cipher;
-	unsigned char *iv,*key,*plaintext,*ciphertext;
-	int encdec;
-	int kn,in,pn,cn;
-
-	if(!fgets((char *)line,sizeof line,f))
-	    break;
-	if(line[0] == '#' || line[0] == '\n')
-	    continue;
-	p=line;
-	cipher=sstrsep(&p,":");	
-	key=ustrsep(&p,":");
-	iv=ustrsep(&p,":");
-	plaintext=ustrsep(&p,":");
-	ciphertext=ustrsep(&p,":");
-	if (p[-1] == '\n') {
-	    p[-1] = '\0';
-	    encdec = -1;
-	} else {
-	    encdec = atoi(sstrsep(&p,"\n"));
-	}
-	      
+	for (;;) {
+		char line[4096];
+		char *p;
+		char *cipher;
+		unsigned char *iv, *key, *plaintext, *ciphertext;
+		int encdec;
+		int kn, in, pn, cn;
+
+		if (!fgets((char *)line, sizeof line, f))
+			break;
+		if (line[0] == '#' || line[0] == '\n')
+			continue;
+		p = line;
+		cipher=sstrsep(&p, ":");
+		key=ustrsep(&p, ":");
+		iv=ustrsep(&p, ":");
+		plaintext=ustrsep(&p, ":");
+		ciphertext=ustrsep(&p, ":");
+		if (p[-1] == '\n') {
+			p[-1] = '\0';
+			encdec = -1;
+		} else {
+			encdec = atoi(sstrsep(&p, "\n"));
+		}
+
 
-	kn=convert(key);
-	in=convert(iv);
-	pn=convert(plaintext);
-	cn=convert(ciphertext);
+		kn = convert(key);
+		in = convert(iv);
+		pn = convert(plaintext);
+		cn = convert(ciphertext);
 
-	if(!test_cipher(cipher,key,kn,iv,in,plaintext,pn,ciphertext,cn,encdec)
-	   && !test_digest(cipher,plaintext,pn,ciphertext,cn))
-	    {
+		if (!test_cipher(cipher, key, kn, iv, in, plaintext, pn, ciphertext, cn, encdec) &&
+		    !test_digest(cipher, plaintext, pn, ciphertext, cn)) {
 #ifdef OPENSSL_NO_AES
-	    if (strstr(cipher, "AES") == cipher)
-		{
-		fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-		continue;
-		}
+			if (strstr(cipher, "AES") == cipher) {
+				fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+				continue;
+			}
 #endif
 #ifdef OPENSSL_NO_DES
-	    if (strstr(cipher, "DES") == cipher)
-		{
-		fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-		continue;
-		}
+			if (strstr(cipher, "DES") == cipher) {
+				fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+				continue;
+			}
 #endif
 #ifdef OPENSSL_NO_RC4
-	    if (strstr(cipher, "RC4") == cipher)
-		{
-		fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-		continue;
-		}
+			if (strstr(cipher, "RC4") == cipher) {
+				fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+				continue;
+			}
 #endif
 #ifdef OPENSSL_NO_CAMELLIA
-	    if (strstr(cipher, "CAMELLIA") == cipher)
-		{
-		fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-		continue;
-		}
+			if (strstr(cipher, "CAMELLIA") == cipher) {
+				fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+				continue;
+			}
 #endif
 #ifdef OPENSSL_NO_SEED
-	    if (strstr(cipher, "SEED") == cipher)
-		{
-		fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-		continue;
-		}
+			if (strstr(cipher, "SEED") == cipher) {
+				fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+				continue;
+			}
 #endif
 #ifdef OPENSSL_NO_CHACHA
-	    if (strstr(cipher, "ChaCha") == cipher)
-		{
-		fprintf(stdout, "Cipher disabled, skipping %s\n", cipher); 
-		continue;
-		}
+			if (strstr(cipher, "ChaCha") == cipher) {
+				fprintf(stdout, "Cipher disabled, skipping %s\n", cipher);
+				continue;
+			}
 #endif
-	    fprintf(stderr,"Can't find %s\n",cipher);
-	    exit(3);
-	    }
+			fprintf(stderr, "Can't find %s\n",cipher);
+			exit(3);
+		}
 	}
 	fclose(f);
 
 #ifndef OPENSSL_NO_ENGINE
-    ENGINE_cleanup();
+	ENGINE_cleanup();
 #endif
-    EVP_cleanup();
-    CRYPTO_cleanup_all_ex_data();
-    ERR_remove_thread_state(NULL);
-    ERR_free_strings();
-    CRYPTO_mem_leaks_fp(stderr);
-
-    return 0;
-    }
+	EVP_cleanup();
+	CRYPTO_cleanup_all_ex_data();
+	ERR_remove_thread_state(NULL);
+	ERR_free_strings();
+	CRYPTO_mem_leaks_fp(stderr);
+
+	return 0;
+}