generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix no-scrypt

Browse Source 
Fix the evp tests when no-scrypt is used.

Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2016-03-21 11:23:08 +00:00
parent 18cb0221b9
commit 83bd31da23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/evp_test.c
View File

@ -209,6 +209,8 @@ static int test_bin(const char *value, unsigned char **buf, size_t *buflen)
*buflen = len; *buflen = len;
return 1; return 1;
} }
#ifndef OPENSSL_NO_SCRYPT
/* Currently only used by scrypt tests */
/* Parse unsigned decimal 64 bit integer value */ /* Parse unsigned decimal 64 bit integer value */
static int test_uint64(const char *value, uint64_t *pr) 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; return 1;
} }
#endif
/* Structure holding test information */ /* Structure holding test information */
struct evp_test { struct evp_test {
@ -1509,16 +1512,20 @@ static int pbe_test_init(struct evp_test *t, const char *alg)
struct pbe_data *pdat; struct pbe_data *pdat;
int pbe_type = 0; int pbe_type = 0;
if (strcmp(alg, "scrypt") == 0) {
#ifndef OPENSSL_NO_SCRYPT #ifndef OPENSSL_NO_SCRYPT
if (strcmp(alg, "scrypt") == 0)
pbe_type = PBE_TYPE_SCRYPT; pbe_type = PBE_TYPE_SCRYPT;
#else
t->skip = 1;
return 1;
#endif #endif
else if (strcmp(alg, "pbkdf2") == 0) } else if (strcmp(alg, "pbkdf2") == 0) {
pbe_type = PBE_TYPE_PBKDF2; pbe_type = PBE_TYPE_PBKDF2;
else if (strcmp(alg, "pkcs12") == 0) } else if (strcmp(alg, "pkcs12") == 0) {
pbe_type = PBE_TYPE_PKCS12; pbe_type = PBE_TYPE_PKCS12;
else } else {
fprintf(stderr, "Unknown pbe algorithm %s\n", alg); fprintf(stderr, "Unknown pbe algorithm %s\n", alg);
}
pdat = OPENSSL_malloc(sizeof(*pdat)); pdat = OPENSSL_malloc(sizeof(*pdat));
pdat->pbe_type = pbe_type; pdat->pbe_type = pbe_type;
pdat->pass = NULL; pdat->pass = NULL;