The branch master has been updated
via 83bd31da23c668388ff20722ed1fa062590c9860 (commit)
from 18cb0221b9352adc6507adbcec301b49546cbc3e (commit)
- Log -----------------------------------------------------------------
commit 83bd31da23c668388ff20722ed1fa062590c9860
Author: Matt Caswell <[email protected]>
Date: Mon Mar 21 11:23:08 2016 +0000
Fix no-scrypt
Fix the evp tests when no-scrypt is used.
Reviewed-by: Richard Levitte <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
test/evp_test.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/test/evp_test.c b/test/evp_test.c
index ed03c86..e422545 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;
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
