Browse Source

increase coverage

Karel Miko 8 years ago
parent
commit
784a009efe
3 changed files with 28 additions and 3 deletions
  1. 15 0
      src/prngs/sprng.c
  2. 10 3
      testprof/cipher_hash_test.c
  3. 3 0
      testprof/x86_prof.c

+ 15 - 0
src/prngs/sprng.c

@@ -133,7 +133,22 @@ int sprng_import(const unsigned char *in, unsigned long inlen, prng_state *prng)
 */
 */
 int sprng_test(void)
 int sprng_test(void)
 {
 {
+#ifndef LTC_TEST
+   return CRYPT_NOP;
+#else
+   prng_state st;
+   unsigned char en[] = { 0x01, 0x02, 0x03, 0x04 };
+   unsigned char out[1000];
+   int err;
+
+   if ((err = sprng_start(&st)) != CRYPT_OK)                         return err;
+   if ((err = sprng_add_entropy(en, sizeof(en), &st)) != CRYPT_OK)   return err;
+   if ((err = sprng_ready(&st)) != CRYPT_OK)                         return err;
+   if (sprng_read(out, 500, &st) != 500)                             return CRYPT_ERROR_READPRNG; /* skip 500 bytes */
+   if ((err = sprng_done(&st)) != CRYPT_OK)                          return err;
+
    return CRYPT_OK;
    return CRYPT_OK;
+#endif
 }
 }
 
 
 #endif
 #endif

+ 10 - 3
testprof/cipher_hash_test.c

@@ -6,7 +6,7 @@ int cipher_hash_test(void)
 {
 {
    int           x;
    int           x;
    unsigned char buf[4096];
    unsigned char buf[4096];
-   unsigned long n;
+   unsigned long n, one;
    prng_state    nprng;
    prng_state    nprng;
 
 
    /* test ciphers */
    /* test ciphers */
@@ -40,13 +40,20 @@ int cipher_hash_test(void)
       DOX(prng_descriptor[x].add_entropy((unsigned char *)"helloworld12", 12, &nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].add_entropy((unsigned char *)"helloworld12", 12, &nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].ready(&nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].ready(&nprng), prng_descriptor[x].name);
       n = sizeof(buf);
       n = sizeof(buf);
+      if (strcmp(prng_descriptor[x].name, "sprng")) {
+         one = 1;
+         if (prng_descriptor[x].pexport(buf, &one, &nprng) != CRYPT_BUFFER_OVERFLOW) {
+            fprintf(stderr, "Error testing pexport with a short buffer (%s)\n", prng_descriptor[x].name);
+            return CRYPT_ERROR;
+         }
+      }
       DOX(prng_descriptor[x].pexport(buf, &n, &nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].pexport(buf, &n, &nprng), prng_descriptor[x].name);
       prng_descriptor[x].done(&nprng);
       prng_descriptor[x].done(&nprng);
       DOX(prng_descriptor[x].pimport(buf, n, &nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].pimport(buf, n, &nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].ready(&nprng), prng_descriptor[x].name);
       DOX(prng_descriptor[x].ready(&nprng), prng_descriptor[x].name);
       if (prng_descriptor[x].read(buf, 100, &nprng) != 100) {
       if (prng_descriptor[x].read(buf, 100, &nprng) != 100) {
-         fprintf(stderr, "Error reading from imported PRNG!\n");
-         exit(EXIT_FAILURE);
+         fprintf(stderr, "Error reading from imported PRNG (%s)!\n", prng_descriptor[x].name);
+         return CRYPT_ERROR;
       }
       }
       prng_descriptor[x].done(&nprng);
       prng_descriptor[x].done(&nprng);
    }
    }

+ 3 - 0
testprof/x86_prof.c

@@ -530,6 +530,9 @@ register_prng(&chacha20_prng_desc);
 #ifdef LTC_SOBER128
 #ifdef LTC_SOBER128
 register_prng(&sober128_desc);
 register_prng(&sober128_desc);
 #endif
 #endif
+#ifdef LTC_SPRNG
+register_prng(&sprng_desc);
+#endif
 
 
 #ifdef LTC_PRNG_ENABLE_LTC_RNG
 #ifdef LTC_PRNG_ENABLE_LTC_RNG
    ltc_rng = my_test_rng;
    ltc_rng = my_test_rng;