diff options
| author | Matt Caswell <matt@openssl.org> | 2016-03-21 11:23:08 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-03-21 14:36:22 +0000 |
| commit | 83bd31da23c668388ff20722ed1fa062590c9860 (patch) | |
| tree | c68fa045cbb18c98b9d3c2c795bfb5ec3726b752 /test | |
| parent | 18cb0221b9352adc6507adbcec301b49546cbc3e (diff) | |
Fix no-scrypt
Fix the evp tests when no-scrypt is used.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'test')
| -rw-r--r-- | test/evp_test.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index ed03c86ce7..e42254591f 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -209,6 +209,8 @@ static int test_bin(const char *value, unsigned char **buf, size_t *buflen) *buflen = len; return 1; } +#ifndef OPENSSL_NO_SCRYPT +/* Currently only used by scrypt tests */ /* Parse unsigned decimal 64 bit integer value */ static int test_uint64(const char *value, uint64_t *pr) { @@ -233,6 +235,7 @@ static int test_uint64(const char *value, uint64_t *pr) } return 1; } +#endif /* Structure holding test information */ struct evp_test { @@ -1509,16 +1512,20 @@ static int pbe_test_init(struct evp_test *t, const char *alg) struct pbe_data *pdat; int pbe_type = 0; + if (strcmp(alg, "scrypt") == 0) { #ifndef OPENSSL_NO_SCRYPT - if (strcmp(alg, "scrypt") == 0) pbe_type = PBE_TYPE_SCRYPT; +#else + t->skip = 1; + return 1; #endif - else if (strcmp(alg, "pbkdf2") == 0) + } else if (strcmp(alg, "pbkdf2") == 0) { pbe_type = PBE_TYPE_PBKDF2; - else if (strcmp(alg, "pkcs12") == 0) + } else if (strcmp(alg, "pkcs12") == 0) { pbe_type = PBE_TYPE_PKCS12; - else + } else { fprintf(stderr, "Unknown pbe algorithm %s\n", alg); + } pdat = OPENSSL_malloc(sizeof(*pdat)); pdat->pbe_type = pbe_type; pdat->pass = NULL; |