make depend.

[openssl.git] / test / igetest.c

diff --git a/test/igetest.c b/test/igetest.c
index 2f2271b4a784ebff7493d0d906942e6dbce3803a..1ba900244ded184f5b6ae371462f0d89e63f433a 100644 (file)
--- a/test/igetest.c
+++ b/test/igetest.c
@@ -190,7 +190,7 @@ static struct bi_ige_test const bi_ige_test_vectors[] = {
 
 static int run_test_vectors(void)
        {
-       int n;
+       unsigned int n;
        int errs = 0;
 
        for(n=0 ; n < sizeof(ige_test_vectors)/sizeof(ige_test_vectors[0]) ; ++n)
@@ -218,6 +218,23 @@ static int run_test_vectors(void)
                        hexdump(stdout, "expected", v->out, v->length);
                        hexdump(stdout, "got", buf, v->length);
 
+                       ++errs;
+                       }
+
+                /* try with in == out */
+               memcpy(iv, v->iv, sizeof iv);
+                memcpy(buf, v->in, v->length);
+               AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt);
+
+               if(memcmp(v->out, buf, v->length))
+                       {
+                       printf("IGE test vector %d failed (with in == out)\n", n);
+                       hexdump(stdout, "key", v->key, sizeof v->key);
+                       hexdump(stdout, "iv", v->iv, sizeof v->iv);
+                       hexdump(stdout, "in", v->in, v->length);
+                       hexdump(stdout, "expected", v->out, v->length);
+                       hexdump(stdout, "got", buf, v->length);
+
                        ++errs;
                        }
                }
@@ -275,7 +292,7 @@ int main(int argc, char **argv)
        unsigned char iv[AES_BLOCK_SIZE*4];
        unsigned char saved_iv[AES_BLOCK_SIZE*4];
        int err = 0;
-       int n;
+       unsigned int n;
        unsigned matches;
 
        assert(BIG_TEST_SIZE >= TEST_SIZE);
@@ -285,9 +302,9 @@ int main(int argc, char **argv)
        RAND_pseudo_bytes(iv, sizeof iv);
        memcpy(saved_iv, iv, sizeof saved_iv);
 
-       // Forward IGE only...
+       /* Forward IGE only... */
 
-       // Straight encrypt/decrypt
+       /* Straight encrypt/decrypt */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, iv,
                                        AES_ENCRYPT);
@@ -305,7 +322,7 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // Now check encrypt chaining works
+       /* Now check encrypt chaining works */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        memcpy(iv, saved_iv, sizeof iv);
        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
@@ -327,7 +344,7 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // And check decrypt chaining
+       /* And check decrypt chaining */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        memcpy(iv, saved_iv, sizeof iv);
        AES_ige_encrypt(plaintext, ciphertext, TEST_SIZE/2, &key, iv,
@@ -352,13 +369,13 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // make sure garble extends forwards only
+       /* make sure garble extends forwards only */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        memcpy(iv, saved_iv, sizeof iv);
        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
                                        AES_ENCRYPT);
 
-       // corrupt halfway through
+       /* corrupt halfway through */
        ++ciphertext[sizeof ciphertext/2];
        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
        memcpy(iv, saved_iv, sizeof iv);
@@ -382,14 +399,14 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // Bi-directional IGE
+       /* Bi-directional IGE */
 
-       // Note that we don't have to recover the IV, because chaining isn't
-       // possible with biIGE, so the IV is not updated.
+       /* Note that we don't have to recover the IV, because chaining isn't */
+       /* possible with biIGE, so the IV is not updated. */
 
        RAND_pseudo_bytes(rkey2, sizeof rkey2);
 
-       // Straight encrypt/decrypt
+       /* Straight encrypt/decrypt */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
        AES_bi_ige_encrypt(plaintext, ciphertext, TEST_SIZE, &key, &key2, iv,
@@ -408,13 +425,13 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // make sure garble extends both ways
+       /* make sure garble extends both ways */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
                                        AES_ENCRYPT);
 
-       // corrupt halfway through
+       /* corrupt halfway through */
        ++ciphertext[sizeof ciphertext/2];
        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
@@ -432,13 +449,13 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // make sure garble extends both ways (2)
+       /* make sure garble extends both ways (2) */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
                                        AES_ENCRYPT);
 
-       // corrupt right at the end
+       /* corrupt right at the end */
        ++ciphertext[sizeof ciphertext-1];
        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);
@@ -456,13 +473,13 @@ int main(int argc, char **argv)
                ++err;
                }
 
-       // make sure garble extends both ways (3)
+       /* make sure garble extends both ways (3) */
        AES_set_encrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_encrypt_key(rkey2, 8*sizeof rkey2, &key2);
        AES_ige_encrypt(plaintext, ciphertext, sizeof plaintext, &key, iv,
                                        AES_ENCRYPT);
 
-       // corrupt right at the start
+       /* corrupt right at the start */
        ++ciphertext[0];
        AES_set_decrypt_key(rkey, 8*sizeof rkey, &key);
        AES_set_decrypt_key(rkey2, 8*sizeof rkey2, &key2);