/*
- * Copyright 2015-2017 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2015-2019 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <openssl/evp.h>
#include <openssl/pem.h>
#include <openssl/err.h>
+#include <openssl/provider.h>
#include <openssl/x509v3.h>
#include <openssl/pkcs12.h>
#include <openssl/kdf.h>
+#include <openssl/params.h>
+#include <openssl/core_names.h>
#include "internal/numbers.h"
+#include "internal/nelem.h"
#include "testutil.h"
#include "evp_test.h"
+#define AAD_NUM 4
typedef struct evp_test_method_st EVP_TEST_METHOD;
* Structure holding test information
*/
typedef struct evp_test_st {
- BIO *in; /* file being read */
- int line; /* current line being processed */
- int start_line; /* start line of current test */
- int ntests; /* Number of tests */
- int errors; /* Error count */
+ STANZA s; /* Common test stanza */
+ char *name;
int skip; /* Current test should be skipped */
- int nskip; /* Number of tests skipped */
- char buf[10240]; /* Input buffer */
- BIO *key; /* temp memory BIO for reading in keys */
const EVP_TEST_METHOD *meth; /* method for this test */
const char *err, *aux_err; /* Error string for test */
char *expected_err; /* Expected error value of test */
- char *func; /* Expected error function string */
char *reason; /* Expected error reason string */
void *data; /* test specific data */
} EVP_TEST;
static int parse_bin(const char *value, unsigned char **buf, size_t *buflen);
-static const char *current_test_file = "???";
+/*
+ * Compare two memory regions for equality, returning zero if they differ.
+ * However, if there is expected to be an error and the actual error
+ * matches then the memory is expected to be different so handle this
+ * case without producing unnecessary test framework output.
+ */
+static int memory_err_compare(EVP_TEST *t, const char *err,
+ const void *expected, size_t expected_len,
+ const void *got, size_t got_len)
+{
+ int r;
+
+ if (t->expected_err != NULL && strcmp(t->expected_err, err) == 0)
+ r = !TEST_mem_ne(expected, expected_len, got, got_len);
+ else
+ r = TEST_mem_eq(expected, expected_len, got, got_len);
+ if (!r)
+ t->err = err;
+ return r;
+}
/*
* Structure used to hold a list of blocks of memory to test
return 1;
}
-static int compare_mem(unsigned char *expected, size_t expected_len,
- unsigned char *got, size_t got_len)
-{
- if (!TEST_mem_eq(expected, expected_len, got, got_len))
- return 0;
- return 1;
-}
-
/*
* Unescape some sequences in string literals (only \n for now).
* Return an allocated buffer, set |out_len|. If |input_len|
/* Otherwise assume as hex literal and convert it to binary buffer */
if (!TEST_ptr(*buf = OPENSSL_hexstr2buf(value, &len))) {
TEST_info("Can't convert %s", value);
- ERR_print_errors(bio_err);
+ TEST_openssl_errors();
return -1;
}
/* Size of input buffer means we'll never overflow */
static int digest_test_run(EVP_TEST *t)
{
- DIGEST_DATA *mdata = t->data;
+ DIGEST_DATA *expected = t->data;
EVP_MD_CTX *mctx;
- unsigned char md[EVP_MAX_MD_SIZE];
- unsigned int md_len;
+ unsigned char *got = NULL;
+ unsigned int got_len;
t->err = "TEST_FAILURE";
if (!TEST_ptr(mctx = EVP_MD_CTX_new()))
goto err;
- if (!EVP_DigestInit_ex(mctx, mdata->digest, NULL)) {
+ got = OPENSSL_malloc(expected->output_len > EVP_MAX_MD_SIZE ?
+ expected->output_len : EVP_MAX_MD_SIZE);
+ if (!TEST_ptr(got))
+ goto err;
+
+ if (!EVP_DigestInit_ex(mctx, expected->digest, NULL)) {
t->err = "DIGESTINIT_ERROR";
goto err;
}
- if (!evp_test_buffer_do(mdata->input, digest_update_fn, mctx)) {
+ if (!evp_test_buffer_do(expected->input, digest_update_fn, mctx)) {
t->err = "DIGESTUPDATE_ERROR";
goto err;
}
- if (!EVP_DigestFinal(mctx, md, &md_len)) {
- t->err = "DIGESTFINAL_ERROR";
- goto err;
+ if (EVP_MD_flags(expected->digest) & EVP_MD_FLAG_XOF) {
+ EVP_MD_CTX *mctx_cpy;
+ char dont[] = "touch";
+
+ if (!TEST_ptr(mctx_cpy = EVP_MD_CTX_new())) {
+ goto err;
+ }
+ if (!EVP_MD_CTX_copy(mctx_cpy, mctx)) {
+ EVP_MD_CTX_free(mctx_cpy);
+ goto err;
+ }
+ if (!EVP_DigestFinalXOF(mctx_cpy, (unsigned char *)dont, 0)) {
+ EVP_MD_CTX_free(mctx_cpy);
+ t->err = "DIGESTFINALXOF_ERROR";
+ goto err;
+ }
+ if (!TEST_str_eq(dont, "touch")) {
+ EVP_MD_CTX_free(mctx_cpy);
+ t->err = "DIGESTFINALXOF_ERROR";
+ goto err;
+ }
+ EVP_MD_CTX_free(mctx_cpy);
+
+ got_len = expected->output_len;
+ if (!EVP_DigestFinalXOF(mctx, got, got_len)) {
+ t->err = "DIGESTFINALXOF_ERROR";
+ goto err;
+ }
+ } else {
+ if (!EVP_DigestFinal(mctx, got, &got_len)) {
+ t->err = "DIGESTFINAL_ERROR";
+ goto err;
+ }
}
- if (md_len != mdata->output_len) {
+ if (!TEST_int_eq(expected->output_len, got_len)) {
t->err = "DIGEST_LENGTH_MISMATCH";
goto err;
}
- if (!compare_mem(mdata->output, mdata->output_len, md, md_len)) {
- t->err = "DIGEST_MISMATCH";
+ if (!memory_err_compare(t, "DIGEST_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
goto err;
- }
+
t->err = NULL;
err:
+ OPENSSL_free(got);
EVP_MD_CTX_free(mctx);
return 1;
}
size_t plaintext_len;
unsigned char *ciphertext;
size_t ciphertext_len;
- /* GCM, CCM only */
- unsigned char *aad;
- size_t aad_len;
+ /* GCM, CCM, OCB and SIV only */
+ unsigned char *aad[AAD_NUM];
+ size_t aad_len[AAD_NUM];
unsigned char *tag;
size_t tag_len;
+ int tag_late;
} CIPHER_DATA;
static int cipher_test_init(EVP_TEST *t, const char *alg)
m = EVP_CIPHER_mode(cipher);
if (m == EVP_CIPH_GCM_MODE
|| m == EVP_CIPH_OCB_MODE
+ || m == EVP_CIPH_SIV_MODE
|| m == EVP_CIPH_CCM_MODE)
- cdat->aead = EVP_CIPHER_mode(cipher);
+ cdat->aead = m;
else if (EVP_CIPHER_flags(cipher) & EVP_CIPH_FLAG_AEAD_CIPHER)
cdat->aead = -1;
else
static void cipher_test_cleanup(EVP_TEST *t)
{
+ int i;
CIPHER_DATA *cdat = t->data;
OPENSSL_free(cdat->key);
OPENSSL_free(cdat->iv);
OPENSSL_free(cdat->ciphertext);
OPENSSL_free(cdat->plaintext);
- OPENSSL_free(cdat->aad);
+ for (i = 0; i < AAD_NUM; i++)
+ OPENSSL_free(cdat->aad[i]);
OPENSSL_free(cdat->tag);
}
const char *value)
{
CIPHER_DATA *cdat = t->data;
+ int i;
if (strcmp(keyword, "Key") == 0)
return parse_bin(value, &cdat->key, &cdat->key_len);
if (strcmp(keyword, "Ciphertext") == 0)
return parse_bin(value, &cdat->ciphertext, &cdat->ciphertext_len);
if (cdat->aead) {
- if (strcmp(keyword, "AAD") == 0)
- return parse_bin(value, &cdat->aad, &cdat->aad_len);
+ if (strcmp(keyword, "AAD") == 0) {
+ for (i = 0; i < AAD_NUM; i++) {
+ if (cdat->aad[i] == NULL)
+ return parse_bin(value, &cdat->aad[i], &cdat->aad_len[i]);
+ }
+ return -1;
+ }
if (strcmp(keyword, "Tag") == 0)
return parse_bin(value, &cdat->tag, &cdat->tag_len);
+ if (strcmp(keyword, "SetTagLate") == 0) {
+ if (strcmp(value, "TRUE") == 0)
+ cdat->tag_late = 1;
+ else if (strcmp(value, "FALSE") == 0)
+ cdat->tag_late = 0;
+ else
+ return -1;
+ return 1;
+ }
}
if (strcmp(keyword, "Operation") == 0) {
else if (strcmp(value, "DECRYPT") == 0)
cdat->enc = 0;
else
- return 0;
+ return -1;
return 1;
}
return 0;
static int cipher_test_enc(EVP_TEST *t, int enc,
size_t out_misalign, size_t inp_misalign, int frag)
{
- CIPHER_DATA *cdat = t->data;
- unsigned char *in, *out, *tmp = NULL;
+ CIPHER_DATA *expected = t->data;
+ unsigned char *in, *expected_out, *tmp = NULL;
size_t in_len, out_len, donelen = 0;
- int ok = 0, tmplen, chunklen, tmpflen;
+ int ok = 0, tmplen, chunklen, tmpflen, i;
EVP_CIPHER_CTX *ctx = NULL;
t->err = "TEST_FAILURE";
goto err;
EVP_CIPHER_CTX_set_flags(ctx, EVP_CIPHER_CTX_FLAG_WRAP_ALLOW);
if (enc) {
- in = cdat->plaintext;
- in_len = cdat->plaintext_len;
- out = cdat->ciphertext;
- out_len = cdat->ciphertext_len;
+ in = expected->plaintext;
+ in_len = expected->plaintext_len;
+ expected_out = expected->ciphertext;
+ out_len = expected->ciphertext_len;
} else {
- in = cdat->ciphertext;
- in_len = cdat->ciphertext_len;
- out = cdat->plaintext;
- out_len = cdat->plaintext_len;
+ in = expected->ciphertext;
+ in_len = expected->ciphertext_len;
+ expected_out = expected->plaintext;
+ out_len = expected->plaintext_len;
}
if (inp_misalign == (size_t)-1) {
/*
in = memcpy(tmp + out_misalign + in_len + 2 * EVP_MAX_BLOCK_LENGTH +
inp_misalign, in, in_len);
}
- if (!EVP_CipherInit_ex(ctx, cdat->cipher, NULL, NULL, NULL, enc)) {
+ if (!EVP_CipherInit_ex(ctx, expected->cipher, NULL, NULL, NULL, enc)) {
t->err = "CIPHERINIT_ERROR";
goto err;
}
- if (cdat->iv) {
- if (cdat->aead) {
+ if (expected->iv) {
+ if (expected->aead) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN,
- cdat->iv_len, 0)) {
+ expected->iv_len, 0)) {
t->err = "INVALID_IV_LENGTH";
goto err;
}
- } else if (cdat->iv_len != (size_t)EVP_CIPHER_CTX_iv_length(ctx)) {
+ } else if (expected->iv_len != (size_t)EVP_CIPHER_CTX_iv_length(ctx)) {
t->err = "INVALID_IV_LENGTH";
goto err;
}
}
- if (cdat->aead) {
+ if (expected->aead) {
unsigned char *tag;
/*
* If encrypting or OCB just set tag length initially, otherwise
* set tag length and value.
*/
- if (enc || cdat->aead == EVP_CIPH_OCB_MODE) {
+ if (enc || expected->aead == EVP_CIPH_OCB_MODE || expected->tag_late) {
t->err = "TAG_LENGTH_SET_ERROR";
tag = NULL;
} else {
t->err = "TAG_SET_ERROR";
- tag = cdat->tag;
+ tag = expected->tag;
}
- if (tag || cdat->aead != EVP_CIPH_GCM_MODE) {
+ if (tag || expected->aead != EVP_CIPH_GCM_MODE) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- cdat->tag_len, tag))
+ expected->tag_len, tag))
goto err;
}
}
- if (!EVP_CIPHER_CTX_set_key_length(ctx, cdat->key_len)) {
+ if (!EVP_CIPHER_CTX_set_key_length(ctx, expected->key_len)) {
t->err = "INVALID_KEY_LENGTH";
goto err;
}
- if (!EVP_CipherInit_ex(ctx, NULL, NULL, cdat->key, cdat->iv, -1)) {
+ if (!EVP_CipherInit_ex(ctx, NULL, NULL, expected->key, expected->iv, -1)) {
t->err = "KEY_SET_ERROR";
goto err;
}
-
- if (!enc && cdat->aead == EVP_CIPH_OCB_MODE) {
- if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- cdat->tag_len, cdat->tag)) {
- t->err = "TAG_SET_ERROR";
- goto err;
- }
+ /* Check that we get the same IV back */
+ if (expected->iv != NULL
+ && (EVP_CIPHER_flags(expected->cipher) & EVP_CIPH_CUSTOM_IV) == 0
+ && !TEST_mem_eq(expected->iv, expected->iv_len,
+ EVP_CIPHER_CTX_iv(ctx), expected->iv_len)) {
+ t->err = "INVALID_IV";
+ goto err;
}
- if (cdat->aead == EVP_CIPH_CCM_MODE) {
+ if (expected->aead == EVP_CIPH_CCM_MODE) {
if (!EVP_CipherUpdate(ctx, NULL, &tmplen, NULL, out_len)) {
t->err = "CCM_PLAINTEXT_LENGTH_SET_ERROR";
goto err;
}
}
- if (cdat->aad) {
+ if (expected->aad[0] != NULL) {
t->err = "AAD_SET_ERROR";
if (!frag) {
- if (!EVP_CipherUpdate(ctx, NULL, &chunklen, cdat->aad,
- cdat->aad_len))
- goto err;
+ for (i = 0; expected->aad[i] != NULL; i++) {
+ if (!EVP_CipherUpdate(ctx, NULL, &chunklen, expected->aad[i],
+ expected->aad_len[i]))
+ goto err;
+ }
} else {
/*
* Supply the AAD in chunks less than the block size where possible
*/
- if (cdat->aad_len > 0) {
- if (!EVP_CipherUpdate(ctx, NULL, &chunklen, cdat->aad, 1))
- goto err;
- donelen++;
- }
- if (cdat->aad_len > 2) {
- if (!EVP_CipherUpdate(ctx, NULL, &chunklen, cdat->aad + donelen,
- cdat->aad_len - 2))
+ for (i = 0; expected->aad[i] != NULL; i++) {
+ if (expected->aad_len[i] > 0) {
+ if (!EVP_CipherUpdate(ctx, NULL, &chunklen, expected->aad[i], 1))
+ goto err;
+ donelen++;
+ }
+ if (expected->aad_len[i] > 2) {
+ if (!EVP_CipherUpdate(ctx, NULL, &chunklen,
+ expected->aad[i] + donelen,
+ expected->aad_len[i] - 2))
+ goto err;
+ donelen += expected->aad_len[i] - 2;
+ }
+ if (expected->aad_len[i] > 1
+ && !EVP_CipherUpdate(ctx, NULL, &chunklen,
+ expected->aad[i] + donelen, 1))
goto err;
- donelen += cdat->aad_len - 2;
}
- if (cdat->aad_len > 1
- && !EVP_CipherUpdate(ctx, NULL, &chunklen,
- cdat->aad + donelen, 1))
- goto err;
}
}
+
+ if (!enc && (expected->aead == EVP_CIPH_OCB_MODE || expected->tag_late)) {
+ if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
+ expected->tag_len, expected->tag)) {
+ t->err = "TAG_SET_ERROR";
+ goto err;
+ }
+ }
+
EVP_CIPHER_CTX_set_padding(ctx, 0);
t->err = "CIPHERUPDATE_ERROR";
tmplen = 0;
t->err = "CIPHERFINAL_ERROR";
goto err;
}
- if (!compare_mem(out, out_len, tmp + out_misalign, tmplen + tmpflen)) {
- t->err = "VALUE_MISMATCH";
+ if (!memory_err_compare(t, "VALUE_MISMATCH", expected_out, out_len,
+ tmp + out_misalign, tmplen + tmpflen))
goto err;
- }
- if (enc && cdat->aead) {
+ if (enc && expected->aead) {
unsigned char rtag[16];
- if (cdat->tag_len > sizeof(rtag)) {
+ if (!TEST_size_t_le(expected->tag_len, sizeof(rtag))) {
t->err = "TAG_LENGTH_INTERNAL_ERROR";
goto err;
}
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG,
- cdat->tag_len, rtag)) {
+ expected->tag_len, rtag)) {
t->err = "TAG_RETRIEVE_ERROR";
goto err;
}
- if (!compare_mem(cdat->tag, cdat->tag_len, rtag, cdat->tag_len)) {
- t->err = "TAG_VALUE_MISMATCH";
+ if (!memory_err_compare(t, "TAG_VALUE_MISMATCH",
+ expected->tag, expected->tag_len,
+ rtag, expected->tag_len))
goto err;
- }
}
t->err = NULL;
ok = 1;
if (out_misalign == 1 && frag == 0) {
/*
- * XTS, CCM and Wrap modes have special requirements about input
+ * XTS, SIV, CCM and Wrap modes have special requirements about input
* lengths so we don't fragment for those
*/
if (cdat->aead == EVP_CIPH_CCM_MODE
+ || EVP_CIPHER_mode(cdat->cipher) == EVP_CIPH_SIV_MODE
|| EVP_CIPHER_mode(cdat->cipher) == EVP_CIPH_XTS_MODE
- || EVP_CIPHER_mode(cdat->cipher) == EVP_CIPH_WRAP_MODE)
+ || EVP_CIPHER_mode(cdat->cipher) == EVP_CIPH_WRAP_MODE)
break;
out_misalign = 0;
frag++;
**/
typedef struct mac_data_st {
- /* MAC type */
- int type;
+ /* MAC type in one form or another */
+ EVP_MAC *mac; /* for mac_test_run_mac */
+ int type; /* for mac_test_run_pkey */
/* Algorithm string for this MAC */
char *alg;
/* MAC key */
unsigned char *key;
size_t key_len;
+ /* MAC IV (GMAC) */
+ unsigned char *iv;
+ size_t iv_len;
/* Input to MAC */
unsigned char *input;
size_t input_len;
/* Expected output */
unsigned char *output;
size_t output_len;
+ unsigned char *custom;
+ size_t custom_len;
+ /* MAC salt (blake2) */
+ unsigned char *salt;
+ size_t salt_len;
+ /* Collection of controls */
+ STACK_OF(OPENSSL_STRING) *controls;
} MAC_DATA;
static int mac_test_init(EVP_TEST *t, const char *alg)
{
- int type;
+ EVP_MAC *mac = NULL;
+ int type = NID_undef;
MAC_DATA *mdat;
- if (strcmp(alg, "HMAC") == 0) {
- type = EVP_PKEY_HMAC;
- } else if (strcmp(alg, "CMAC") == 0) {
+ if ((mac = EVP_MAC_fetch(NULL, alg, NULL)) == NULL) {
+ /*
+ * Since we didn't find an EVP_MAC, we check for known EVP_PKEY methods
+ * For debugging purposes, we allow 'NNNN by EVP_PKEY' to force running
+ * the EVP_PKEY method.
+ */
+ size_t sz = strlen(alg);
+ static const char epilogue[] = " by EVP_PKEY";
+
+ if (sz >= sizeof(epilogue)
+ && strcmp(alg + sz - (sizeof(epilogue) - 1), epilogue) == 0)
+ sz -= sizeof(epilogue) - 1;
+
+ if (strncmp(alg, "HMAC", sz) == 0) {
+ type = EVP_PKEY_HMAC;
+ } else if (strncmp(alg, "CMAC", sz) == 0) {
#ifndef OPENSSL_NO_CMAC
- type = EVP_PKEY_CMAC;
+ type = EVP_PKEY_CMAC;
#else
- t->skip = 1;
- return 1;
+ t->skip = 1;
+ return 1;
#endif
- } else if (strcmp(alg, "Poly1305") == 0) {
+ } else if (strncmp(alg, "Poly1305", sz) == 0) {
#ifndef OPENSSL_NO_POLY1305
- type = EVP_PKEY_POLY1305;
+ type = EVP_PKEY_POLY1305;
#else
- t->skip = 1;
- return 1;
+ t->skip = 1;
+ return 1;
#endif
- } else if (strcmp(alg, "SipHash") == 0) {
+ } else if (strncmp(alg, "SipHash", sz) == 0) {
#ifndef OPENSSL_NO_SIPHASH
- type = EVP_PKEY_SIPHASH;
+ type = EVP_PKEY_SIPHASH;
#else
- t->skip = 1;
- return 1;
+ t->skip = 1;
+ return 1;
#endif
- } else
- return 0;
+ } else {
+ /*
+ * Not a known EVP_PKEY method either. If it's a known OID, then
+ * assume it's been disabled.
+ */
+ if (OBJ_sn2nid(alg) != NID_undef || OBJ_ln2nid(alg) != NID_undef) {
+ t->skip = 1;
+ return 1;
+ }
+
+ return 0;
+ }
+ }
mdat = OPENSSL_zalloc(sizeof(*mdat));
mdat->type = type;
+ mdat->mac = mac;
+ mdat->controls = sk_OPENSSL_STRING_new_null();
t->data = mdat;
return 1;
}
+/* Because OPENSSL_free is a macro, it can't be passed as a function pointer */
+static void openssl_free(char *m)
+{
+ OPENSSL_free(m);
+}
+
static void mac_test_cleanup(EVP_TEST *t)
{
MAC_DATA *mdat = t->data;
+ EVP_MAC_free(mdat->mac);
+ sk_OPENSSL_STRING_pop_free(mdat->controls, openssl_free);
OPENSSL_free(mdat->alg);
OPENSSL_free(mdat->key);
+ OPENSSL_free(mdat->iv);
+ OPENSSL_free(mdat->custom);
+ OPENSSL_free(mdat->salt);
OPENSSL_free(mdat->input);
OPENSSL_free(mdat->output);
}
if (strcmp(keyword, "Key") == 0)
return parse_bin(value, &mdata->key, &mdata->key_len);
+ if (strcmp(keyword, "IV") == 0)
+ return parse_bin(value, &mdata->iv, &mdata->iv_len);
+ if (strcmp(keyword, "Custom") == 0)
+ return parse_bin(value, &mdata->custom, &mdata->custom_len);
+ if (strcmp(keyword, "Salt") == 0)
+ return parse_bin(value, &mdata->salt, &mdata->salt_len);
if (strcmp(keyword, "Algorithm") == 0) {
mdata->alg = OPENSSL_strdup(value);
if (!mdata->alg)
- return 0;
+ return -1;
return 1;
}
if (strcmp(keyword, "Input") == 0)
return parse_bin(value, &mdata->input, &mdata->input_len);
if (strcmp(keyword, "Output") == 0)
return parse_bin(value, &mdata->output, &mdata->output_len);
+ if (strcmp(keyword, "Ctrl") == 0)
+ return sk_OPENSSL_STRING_push(mdata->controls,
+ OPENSSL_strdup(value)) != 0;
return 0;
}
-static int mac_test_run(EVP_TEST *t)
+static int mac_test_ctrl_pkey(EVP_TEST *t, EVP_PKEY_CTX *pctx,
+ const char *value)
{
- MAC_DATA *mdata = t->data;
+ int rv;
+ char *p, *tmpval;
+
+ if (!TEST_ptr(tmpval = OPENSSL_strdup(value)))
+ return 0;
+ p = strchr(tmpval, ':');
+ if (p != NULL)
+ *p++ = '\0';
+ rv = EVP_PKEY_CTX_ctrl_str(pctx, tmpval, p);
+ if (rv == -2)
+ t->err = "PKEY_CTRL_INVALID";
+ else if (rv <= 0)
+ t->err = "PKEY_CTRL_ERROR";
+ else
+ rv = 1;
+ OPENSSL_free(tmpval);
+ return rv > 0;
+}
+
+static int mac_test_run_pkey(EVP_TEST *t)
+{
+ MAC_DATA *expected = t->data;
EVP_MD_CTX *mctx = NULL;
EVP_PKEY_CTX *pctx = NULL, *genctx = NULL;
EVP_PKEY *key = NULL;
const EVP_MD *md = NULL;
- unsigned char *mac = NULL;
- size_t mac_len;
+ unsigned char *got = NULL;
+ size_t got_len;
+ int i;
+
+ if (expected->alg == NULL)
+ TEST_info("Trying the EVP_PKEY %s test", OBJ_nid2sn(expected->type));
+ else
+ TEST_info("Trying the EVP_PKEY %s test with %s",
+ OBJ_nid2sn(expected->type), expected->alg);
#ifdef OPENSSL_NO_DES
- if (mdata->alg != NULL && strstr(mdata->alg, "DES") != NULL) {
+ if (expected->alg != NULL && strstr(expected->alg, "DES") != NULL) {
/* Skip DES */
t->err = NULL;
goto err;
}
#endif
- if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_id(mdata->type, NULL))) {
- t->err = "MAC_PKEY_CTX_ERROR";
- goto err;
- }
-
- if (EVP_PKEY_keygen_init(genctx) <= 0) {
- t->err = "MAC_KEYGEN_INIT_ERROR";
- goto err;
- }
- if (mdata->type == EVP_PKEY_CMAC
- && EVP_PKEY_CTX_ctrl_str(genctx, "cipher", mdata->alg) <= 0) {
- t->err = "MAC_ALGORITHM_SET_ERROR";
- goto err;
- }
-
- if (EVP_PKEY_CTX_set_mac_key(genctx, mdata->key, mdata->key_len) <= 0) {
- t->err = "MAC_KEY_SET_ERROR";
+ if (expected->type == EVP_PKEY_CMAC)
+ key = EVP_PKEY_new_CMAC_key(NULL, expected->key, expected->key_len,
+ EVP_get_cipherbyname(expected->alg));
+ else
+ key = EVP_PKEY_new_raw_private_key(expected->type, NULL, expected->key,
+ expected->key_len);
+ if (key == NULL) {
+ t->err = "MAC_KEY_CREATE_ERROR";
goto err;
}
- if (EVP_PKEY_keygen(genctx, &key) <= 0) {
- t->err = "MAC_KEY_GENERATE_ERROR";
- goto err;
- }
- if (mdata->type == EVP_PKEY_HMAC) {
- if (!TEST_ptr(md = EVP_get_digestbyname(mdata->alg))) {
+ if (expected->type == EVP_PKEY_HMAC) {
+ if (!TEST_ptr(md = EVP_get_digestbyname(expected->alg))) {
t->err = "MAC_ALGORITHM_SET_ERROR";
goto err;
}
t->err = "DIGESTSIGNINIT_ERROR";
goto err;
}
-
- if (!EVP_DigestSignUpdate(mctx, mdata->input, mdata->input_len)) {
+ for (i = 0; i < sk_OPENSSL_STRING_num(expected->controls); i++)
+ if (!mac_test_ctrl_pkey(t, pctx,
+ sk_OPENSSL_STRING_value(expected->controls,
+ i))) {
+ t->err = "EVPPKEYCTXCTRL_ERROR";
+ goto err;
+ }
+ if (!EVP_DigestSignUpdate(mctx, expected->input, expected->input_len)) {
t->err = "DIGESTSIGNUPDATE_ERROR";
goto err;
}
- if (!EVP_DigestSignFinal(mctx, NULL, &mac_len)) {
+ if (!EVP_DigestSignFinal(mctx, NULL, &got_len)) {
t->err = "DIGESTSIGNFINAL_LENGTH_ERROR";
goto err;
}
- if (!TEST_ptr(mac = OPENSSL_malloc(mac_len))) {
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "TEST_FAILURE";
goto err;
}
- if (!EVP_DigestSignFinal(mctx, mac, &mac_len)
- || !compare_mem(mdata->output, mdata->output_len, mac, mac_len)) {
+ if (!EVP_DigestSignFinal(mctx, got, &got_len)
+ || !memory_err_compare(t, "TEST_MAC_ERR",
+ expected->output, expected->output_len,
+ got, got_len)) {
t->err = "TEST_MAC_ERR";
goto err;
}
t->err = NULL;
err:
EVP_MD_CTX_free(mctx);
- OPENSSL_free(mac);
+ OPENSSL_free(got);
EVP_PKEY_CTX_free(genctx);
EVP_PKEY_free(key);
return 1;
}
+static int mac_test_run_mac(EVP_TEST *t)
+{
+ MAC_DATA *expected = t->data;
+ EVP_MAC_CTX *ctx = NULL;
+ unsigned char *got = NULL;
+ size_t got_len;
+ int i;
+ OSSL_PARAM params[21];
+ size_t params_n = 0;
+ size_t params_n_allocstart = 0;
+ const OSSL_PARAM *defined_params =
+ EVP_MAC_CTX_settable_params(expected->mac);
+
+ if (expected->alg == NULL)
+ TEST_info("Trying the EVP_MAC %s test", EVP_MAC_name(expected->mac));
+ else
+ TEST_info("Trying the EVP_MAC %s test with %s",
+ EVP_MAC_name(expected->mac), expected->alg);
+
+#ifdef OPENSSL_NO_DES
+ if (expected->alg != NULL && strstr(expected->alg, "DES") != NULL) {
+ /* Skip DES */
+ t->err = NULL;
+ goto err;
+ }
+#endif
+
+ if (expected->alg != NULL)
+ params[params_n++] =
+ OSSL_PARAM_construct_utf8_string(OSSL_MAC_PARAM_ALGORITHM,
+ expected->alg,
+ strlen(expected->alg) + 1);
+ if (expected->key != NULL)
+ params[params_n++] =
+ OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_KEY,
+ expected->key,
+ expected->key_len);
+ if (expected->custom != NULL)
+ params[params_n++] =
+ OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_CUSTOM,
+ expected->custom,
+ expected->custom_len);
+ if (expected->salt != NULL)
+ params[params_n++] =
+ OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_SALT,
+ expected->salt,
+ expected->salt_len);
+ if (expected->iv != NULL)
+ params[params_n++] =
+ OSSL_PARAM_construct_octet_string(OSSL_MAC_PARAM_IV,
+ expected->iv,
+ expected->iv_len);
+
+ /*
+ * Unknown controls. They must match parameters that the MAC recognises
+ */
+ if (params_n + sk_OPENSSL_STRING_num(expected->controls)
+ >= OSSL_NELEM(params)) {
+ t->err = "MAC_TOO_MANY_PARAMETERS";
+ goto err;
+ }
+ params_n_allocstart = params_n;
+ for (i = 0; i < sk_OPENSSL_STRING_num(expected->controls); i++) {
+ char *tmpkey, *tmpval;
+ char *value = sk_OPENSSL_STRING_value(expected->controls, i);
+
+ if (!TEST_ptr(tmpkey = OPENSSL_strdup(value))) {
+ t->err = "MAC_PARAM_ERROR";
+ goto err;
+ }
+ tmpval = strchr(tmpkey, ':');
+ if (tmpval != NULL)
+ *tmpval++ = '\0';
+
+ if (!OSSL_PARAM_allocate_from_text(¶ms[params_n], defined_params,
+ tmpkey, tmpval,
+ strlen(tmpval))) {
+ OPENSSL_free(tmpkey);
+ t->err = "MAC_PARAM_ERROR";
+ goto err;
+ }
+ params_n++;
+
+ OPENSSL_free(tmpkey);
+ }
+ params[params_n] = OSSL_PARAM_construct_end();
+
+ if ((ctx = EVP_MAC_CTX_new(expected->mac)) == NULL) {
+ t->err = "MAC_CREATE_ERROR";
+ goto err;
+ }
+
+ if (!EVP_MAC_CTX_set_params(ctx, params)) {
+ t->err = "MAC_BAD_PARAMS";
+ goto err;
+ }
+ if (!EVP_MAC_init(ctx)) {
+ t->err = "MAC_INIT_ERROR";
+ goto err;
+ }
+ if (!EVP_MAC_update(ctx, expected->input, expected->input_len)) {
+ t->err = "MAC_UPDATE_ERROR";
+ goto err;
+ }
+ if (!EVP_MAC_final(ctx, NULL, &got_len, 0)) {
+ t->err = "MAC_FINAL_LENGTH_ERROR";
+ goto err;
+ }
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
+ t->err = "TEST_FAILURE";
+ goto err;
+ }
+ if (!EVP_MAC_final(ctx, got, &got_len, got_len)
+ || !memory_err_compare(t, "TEST_MAC_ERR",
+ expected->output, expected->output_len,
+ got, got_len)) {
+ t->err = "TEST_MAC_ERR";
+ goto err;
+ }
+ t->err = NULL;
+ err:
+ while (params_n-- > params_n_allocstart) {
+ OPENSSL_free(params[params_n].data);
+ }
+ EVP_MAC_CTX_free(ctx);
+ OPENSSL_free(got);
+ return 1;
+}
+
+static int mac_test_run(EVP_TEST *t)
+{
+ MAC_DATA *expected = t->data;
+
+ if (expected->mac != NULL)
+ return mac_test_run_mac(t);
+ return mac_test_run_pkey(t);
+}
+
static const EVP_TEST_METHOD mac_test_method = {
"MAC",
mac_test_init,
return 0;
}
kdata->keyop = keyop;
- if (!TEST_ptr(kdata->ctx = EVP_PKEY_CTX_new(pkey, NULL)))
+ if (!TEST_ptr(kdata->ctx = EVP_PKEY_CTX_new(pkey, NULL))) {
+ EVP_PKEY_free(pkey);
+ OPENSSL_free(kdata);
return 0;
+ }
if (keyopinit(kdata->ctx) <= 0)
t->err = "KEYOP_INIT_ERROR";
t->data = kdata;
static int pkey_test_run(EVP_TEST *t)
{
- PKEY_DATA *kdata = t->data;
- unsigned char *out = NULL;
- size_t out_len;
+ PKEY_DATA *expected = t->data;
+ unsigned char *got = NULL;
+ size_t got_len;
+ EVP_PKEY_CTX *copy = NULL;
- if (kdata->keyop(kdata->ctx, NULL, &out_len, kdata->input,
- kdata->input_len) <= 0
- || !TEST_ptr(out = OPENSSL_malloc(out_len))) {
+ if (expected->keyop(expected->ctx, NULL, &got_len,
+ expected->input, expected->input_len) <= 0
+ || !TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "KEYOP_LENGTH_ERROR";
goto err;
}
- if (kdata->keyop(kdata->ctx, out,
- &out_len, kdata->input, kdata->input_len) <= 0) {
+ if (expected->keyop(expected->ctx, got, &got_len,
+ expected->input, expected->input_len) <= 0) {
t->err = "KEYOP_ERROR";
goto err;
}
- if (!compare_mem(kdata->output, kdata->output_len, out, out_len)) {
- t->err = "KEYOP_MISMATCH";
+ if (!memory_err_compare(t, "KEYOP_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
goto err;
- }
+
t->err = NULL;
+ OPENSSL_free(got);
+ got = NULL;
+
+ /* Repeat the test on a copy. */
+ if (!TEST_ptr(copy = EVP_PKEY_CTX_dup(expected->ctx))) {
+ t->err = "INTERNAL_ERROR";
+ goto err;
+ }
+ if (expected->keyop(copy, NULL, &got_len, expected->input,
+ expected->input_len) <= 0
+ || !TEST_ptr(got = OPENSSL_malloc(got_len))) {
+ t->err = "KEYOP_LENGTH_ERROR";
+ goto err;
+ }
+ if (expected->keyop(copy, got, &got_len, expected->input,
+ expected->input_len) <= 0) {
+ t->err = "KEYOP_ERROR";
+ goto err;
+ }
+ if (!memory_err_compare(t, "KEYOP_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
+ goto err;
+
err:
- OPENSSL_free(out);
+ OPENSSL_free(got);
+ EVP_PKEY_CTX_free(copy);
return 1;
}
if (strcmp(keyword, "PeerKey") == 0) {
EVP_PKEY *peer;
if (find_key(&peer, value, public_keys) == 0)
- return 0;
+ return -1;
if (EVP_PKEY_derive_set_peer(kdata->ctx, peer) <= 0)
- return 0;
+ return -1;
return 1;
}
if (strcmp(keyword, "SharedSecret") == 0)
static int pderive_test_run(EVP_TEST *t)
{
- PKEY_DATA *kdata = t->data;
- unsigned char *out = NULL;
- size_t out_len;
+ PKEY_DATA *expected = t->data;
+ unsigned char *got = NULL;
+ size_t got_len;
- out_len = kdata->output_len;
- if (!TEST_ptr(out = OPENSSL_malloc(out_len))) {
+ if (EVP_PKEY_derive(expected->ctx, NULL, &got_len) <= 0) {
t->err = "DERIVE_ERROR";
goto err;
}
- if (EVP_PKEY_derive(kdata->ctx, out, &out_len) <= 0) {
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "DERIVE_ERROR";
goto err;
}
- if (!compare_mem(kdata->output, kdata->output_len, out, out_len)) {
- t->err = "SHARED_SECRET_MISMATCH";
+ if (EVP_PKEY_derive(expected->ctx, got, &got_len) <= 0) {
+ t->err = "DERIVE_ERROR";
goto err;
}
+ if (!memory_err_compare(t, "SHARED_SECRET_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
+ goto err;
t->err = NULL;
err:
- OPENSSL_free(out);
+ OPENSSL_free(got);
return 1;
}
return -1;
}
*pr *= 10;
- if (!TEST_true(isdigit(*p))) {
+ if (!TEST_true(isdigit((unsigned char)*p))) {
TEST_error("Invalid character in string %s", value);
return -1;
}
static int pbe_test_run(EVP_TEST *t)
{
- PBE_DATA *pdata = t->data;
+ PBE_DATA *expected = t->data;
unsigned char *key;
- if (!TEST_ptr(key = OPENSSL_malloc(pdata->key_len))) {
+ if (!TEST_ptr(key = OPENSSL_malloc(expected->key_len))) {
t->err = "INTERNAL_ERROR";
goto err;
}
- if (pdata->pbe_type == PBE_TYPE_PBKDF2) {
- if (PKCS5_PBKDF2_HMAC((char *)pdata->pass, pdata->pass_len,
- pdata->salt, pdata->salt_len,
- pdata->iter, pdata->md,
- pdata->key_len, key) == 0) {
+ if (expected->pbe_type == PBE_TYPE_PBKDF2) {
+ if (PKCS5_PBKDF2_HMAC((char *)expected->pass, expected->pass_len,
+ expected->salt, expected->salt_len,
+ expected->iter, expected->md,
+ expected->key_len, key) == 0) {
t->err = "PBKDF2_ERROR";
goto err;
}
#ifndef OPENSSL_NO_SCRYPT
- } else if (pdata->pbe_type == PBE_TYPE_SCRYPT) {
- if (EVP_PBE_scrypt((const char *)pdata->pass, pdata->pass_len,
- pdata->salt, pdata->salt_len,
- pdata->N, pdata->r, pdata->p, pdata->maxmem,
- key, pdata->key_len) == 0) {
+ } else if (expected->pbe_type == PBE_TYPE_SCRYPT) {
+ if (EVP_PBE_scrypt((const char *)expected->pass, expected->pass_len,
+ expected->salt, expected->salt_len, expected->N,
+ expected->r, expected->p, expected->maxmem,
+ key, expected->key_len) == 0) {
t->err = "SCRYPT_ERROR";
goto err;
}
#endif
- } else if (pdata->pbe_type == PBE_TYPE_PKCS12) {
- if (PKCS12_key_gen_uni(pdata->pass, pdata->pass_len,
- pdata->salt, pdata->salt_len,
- pdata->id, pdata->iter, pdata->key_len,
- key, pdata->md) == 0) {
+ } else if (expected->pbe_type == PBE_TYPE_PKCS12) {
+ if (PKCS12_key_gen_uni(expected->pass, expected->pass_len,
+ expected->salt, expected->salt_len,
+ expected->id, expected->iter, expected->key_len,
+ key, expected->md) == 0) {
t->err = "PKCS12_ERROR";
goto err;
}
}
- if (!compare_mem(pdata->key, pdata->key_len, key, pdata->key_len)) {
- t->err = "KEY_MISMATCH";
+ if (!memory_err_compare(t, "KEY_MISMATCH", expected->key, expected->key_len,
+ key, expected->key_len))
goto err;
- }
+
t->err = NULL;
err:
OPENSSL_free(key);
} else if (strcmp(encoding, "invalid") == 0) {
edata->encoding = BASE64_INVALID_ENCODING;
if (!TEST_ptr(t->expected_err = OPENSSL_strdup("DECODE_ERROR")))
- return 0;
+ goto err;
} else {
TEST_error("Bad encoding: %s."
" Should be one of {canonical, valid, invalid}",
encoding);
- return 0;
+ goto err;
}
t->data = edata;
return 1;
+err:
+ OPENSSL_free(edata);
+ return 0;
}
static void encode_test_cleanup(EVP_TEST *t)
static int encode_test_run(EVP_TEST *t)
{
- ENCODE_DATA *edata = t->data;
+ ENCODE_DATA *expected = t->data;
unsigned char *encode_out = NULL, *decode_out = NULL;
int output_len, chunk_len;
- EVP_ENCODE_CTX *decode_ctx;
+ EVP_ENCODE_CTX *decode_ctx = NULL, *encode_ctx = NULL;
if (!TEST_ptr(decode_ctx = EVP_ENCODE_CTX_new())) {
t->err = "INTERNAL_ERROR";
goto err;
}
- if (edata->encoding == BASE64_CANONICAL_ENCODING) {
- EVP_ENCODE_CTX *encode_ctx;
+ if (expected->encoding == BASE64_CANONICAL_ENCODING) {
if (!TEST_ptr(encode_ctx = EVP_ENCODE_CTX_new())
|| !TEST_ptr(encode_out =
- OPENSSL_malloc(EVP_ENCODE_LENGTH(edata->input_len))))
+ OPENSSL_malloc(EVP_ENCODE_LENGTH(expected->input_len))))
goto err;
EVP_EncodeInit(encode_ctx);
- EVP_EncodeUpdate(encode_ctx, encode_out, &chunk_len,
- edata->input, edata->input_len);
+ if (!TEST_true(EVP_EncodeUpdate(encode_ctx, encode_out, &chunk_len,
+ expected->input, expected->input_len)))
+ goto err;
+
output_len = chunk_len;
EVP_EncodeFinal(encode_ctx, encode_out + chunk_len, &chunk_len);
output_len += chunk_len;
- EVP_ENCODE_CTX_free(encode_ctx);
-
- if (!compare_mem(edata->output, edata->output_len,
- encode_out, output_len)) {
- t->err = "BAD_ENCODING";
+ if (!memory_err_compare(t, "BAD_ENCODING",
+ expected->output, expected->output_len,
+ encode_out, output_len))
goto err;
- }
}
if (!TEST_ptr(decode_out =
- OPENSSL_malloc(EVP_DECODE_LENGTH(edata->output_len))))
+ OPENSSL_malloc(EVP_DECODE_LENGTH(expected->output_len))))
goto err;
EVP_DecodeInit(decode_ctx);
- if (EVP_DecodeUpdate(decode_ctx, decode_out, &chunk_len, edata->output,
- edata->output_len) < 0) {
+ if (EVP_DecodeUpdate(decode_ctx, decode_out, &chunk_len, expected->output,
+ expected->output_len) < 0) {
t->err = "DECODE_ERROR";
goto err;
}
}
output_len += chunk_len;
- if (edata->encoding != BASE64_INVALID_ENCODING
- && !compare_mem(edata->input, edata->input_len,
- decode_out, output_len)) {
+ if (expected->encoding != BASE64_INVALID_ENCODING
+ && !memory_err_compare(t, "BAD_DECODING",
+ expected->input, expected->input_len,
+ decode_out, output_len)) {
t->err = "BAD_DECODING";
goto err;
}
OPENSSL_free(encode_out);
OPENSSL_free(decode_out);
EVP_ENCODE_CTX_free(decode_ctx);
+ EVP_ENCODE_CTX_free(encode_ctx);
return 1;
}
encode_test_run,
};
+
/**
*** KDF TESTS
**/
typedef struct kdf_data_st {
/* Context for this operation */
- EVP_PKEY_CTX *ctx;
+ EVP_KDF_CTX *ctx;
/* Expected output */
unsigned char *output;
size_t output_len;
static int kdf_test_init(EVP_TEST *t, const char *name)
{
KDF_DATA *kdata;
+ const EVP_KDF *kdf;
- if (!TEST_ptr(kdata = OPENSSL_zalloc(sizeof(*kdata))))
+#ifdef OPENSSL_NO_SCRYPT
+ if (strcmp(name, "scrypt") == 0) {
+ t->skip = 1;
+ return 1;
+ }
+#endif /* OPENSSL_NO_SCRYPT */
+
+#ifdef OPENSSL_NO_CMS
+ if (strcmp(name, "X942KDF") == 0) {
+ t->skip = 1;
+ return 1;
+ }
+#endif /* OPENSSL_NO_CMS */
+
+ kdf = EVP_get_kdfbyname(name);
+ if (kdf == NULL)
return 0;
- kdata->ctx = EVP_PKEY_CTX_new_id(OBJ_sn2nid(name), NULL);
- if (kdata->ctx == NULL)
+
+ if (!TEST_ptr(kdata = OPENSSL_zalloc(sizeof(*kdata))))
return 0;
- if (EVP_PKEY_derive_init(kdata->ctx) <= 0)
+ kdata->ctx = EVP_KDF_CTX_new(kdf);
+ if (kdata->ctx == NULL) {
+ OPENSSL_free(kdata);
return 0;
+ }
t->data = kdata;
return 1;
}
{
KDF_DATA *kdata = t->data;
OPENSSL_free(kdata->output);
- EVP_PKEY_CTX_free(kdata->ctx);
+ EVP_KDF_CTX_free(kdata->ctx);
}
-static int kdf_test_parse(EVP_TEST *t,
- const char *keyword, const char *value)
+static int kdf_test_ctrl(EVP_TEST *t, EVP_KDF_CTX *kctx,
+ const char *value)
{
- KDF_DATA *kdata = t->data;
+ int rv;
+ char *p, *tmpval;
+
+ if (!TEST_ptr(tmpval = OPENSSL_strdup(value)))
+ return 0;
+ p = strchr(tmpval, ':');
+ if (p != NULL)
+ *p++ = '\0';
+ rv = EVP_KDF_ctrl_str(kctx, tmpval, p);
+ if (rv == -2) {
+ t->err = "KDF_CTRL_INVALID";
+ rv = 1;
+ } else if (p != NULL && rv <= 0) {
+ /* If p has an OID and lookup fails assume disabled algorithm */
+ int nid = OBJ_sn2nid(p);
+
+ if (nid == NID_undef)
+ nid = OBJ_ln2nid(p);
+ if (nid != NID_undef
+ && EVP_get_digestbynid(nid) == NULL
+ && EVP_get_cipherbynid(nid) == NULL) {
+ t->skip = 1;
+ rv = 1;
+ } else {
+ t->err = "KDF_CTRL_ERROR";
+ rv = 1;
+ }
+ }
+ OPENSSL_free(tmpval);
+ return rv > 0;
+}
+
+static int kdf_test_parse(EVP_TEST *t,
+ const char *keyword, const char *value)
+{
+ KDF_DATA *kdata = t->data;
if (strcmp(keyword, "Output") == 0)
return parse_bin(value, &kdata->output, &kdata->output_len);
if (strncmp(keyword, "Ctrl", 4) == 0)
- return pkey_test_ctrl(t, kdata->ctx, value);
+ return kdf_test_ctrl(t, kdata->ctx, value);
return 0;
}
static int kdf_test_run(EVP_TEST *t)
{
- KDF_DATA *kdata = t->data;
- unsigned char *out = NULL;
- size_t out_len = kdata->output_len;
+ KDF_DATA *expected = t->data;
+ unsigned char *got = NULL;
+ size_t got_len = expected->output_len;
- if (!TEST_ptr(out = OPENSSL_malloc(out_len))) {
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "INTERNAL_ERROR";
goto err;
}
- if (EVP_PKEY_derive(kdata->ctx, out, &out_len) <= 0) {
+ if (EVP_KDF_derive(expected->ctx, got, got_len) <= 0) {
t->err = "KDF_DERIVE_ERROR";
goto err;
}
- if (!compare_mem(kdata->output, kdata->output_len, out, out_len)) {
- t->err = "KDF_MISMATCH";
+ if (!memory_err_compare(t, "KDF_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
goto err;
- }
+
t->err = NULL;
err:
- OPENSSL_free(out);
+ OPENSSL_free(got);
return 1;
}
};
+/**
+*** PKEY KDF TESTS
+**/
+
+typedef struct pkey_kdf_data_st {
+ /* Context for this operation */
+ EVP_PKEY_CTX *ctx;
+ /* Expected output */
+ unsigned char *output;
+ size_t output_len;
+} PKEY_KDF_DATA;
+
+/*
+ * Perform public key operation setup: lookup key, allocated ctx and call
+ * the appropriate initialisation function
+ */
+static int pkey_kdf_test_init(EVP_TEST *t, const char *name)
+{
+ PKEY_KDF_DATA *kdata;
+ int kdf_nid = OBJ_sn2nid(name);
+
+#ifdef OPENSSL_NO_SCRYPT
+ if (strcmp(name, "scrypt") == 0) {
+ t->skip = 1;
+ return 1;
+ }
+#endif /* OPENSSL_NO_SCRYPT */
+
+#ifdef OPENSSL_NO_CMS
+ if (strcmp(name, "X942KDF") == 0) {
+ t->skip = 1;
+ return 1;
+ }
+#endif /* OPENSSL_NO_CMS */
+
+ if (kdf_nid == NID_undef)
+ kdf_nid = OBJ_ln2nid(name);
+
+ if (!TEST_ptr(kdata = OPENSSL_zalloc(sizeof(*kdata))))
+ return 0;
+ kdata->ctx = EVP_PKEY_CTX_new_id(kdf_nid, NULL);
+ if (kdata->ctx == NULL) {
+ OPENSSL_free(kdata);
+ return 0;
+ }
+ if (EVP_PKEY_derive_init(kdata->ctx) <= 0) {
+ EVP_PKEY_CTX_free(kdata->ctx);
+ OPENSSL_free(kdata);
+ return 0;
+ }
+ t->data = kdata;
+ return 1;
+}
+
+static void pkey_kdf_test_cleanup(EVP_TEST *t)
+{
+ PKEY_KDF_DATA *kdata = t->data;
+ OPENSSL_free(kdata->output);
+ EVP_PKEY_CTX_free(kdata->ctx);
+}
+
+static int pkey_kdf_test_parse(EVP_TEST *t,
+ const char *keyword, const char *value)
+{
+ PKEY_KDF_DATA *kdata = t->data;
+
+ if (strcmp(keyword, "Output") == 0)
+ return parse_bin(value, &kdata->output, &kdata->output_len);
+ if (strncmp(keyword, "Ctrl", 4) == 0)
+ return pkey_test_ctrl(t, kdata->ctx, value);
+ return 0;
+}
+
+static int pkey_kdf_test_run(EVP_TEST *t)
+{
+ PKEY_KDF_DATA *expected = t->data;
+ unsigned char *got = NULL;
+ size_t got_len = expected->output_len;
+
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
+ t->err = "INTERNAL_ERROR";
+ goto err;
+ }
+ if (EVP_PKEY_derive(expected->ctx, got, &got_len) <= 0) {
+ t->err = "KDF_DERIVE_ERROR";
+ goto err;
+ }
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
+ t->err = "KDF_MISMATCH";
+ goto err;
+ }
+ t->err = NULL;
+
+ err:
+ OPENSSL_free(got);
+ return 1;
+}
+
+static const EVP_TEST_METHOD pkey_kdf_test_method = {
+ "PKEYKDF",
+ pkey_kdf_test_init,
+ pkey_kdf_test_cleanup,
+ pkey_kdf_test_parse,
+ pkey_kdf_test_run
+};
+
+
/**
*** KEYPAIR TESTS
**/
keypair_test_run
};
+/**
+*** KEYGEN TEST
+**/
+
+typedef struct keygen_test_data_st {
+ EVP_PKEY_CTX *genctx; /* Keygen context to use */
+ char *keyname; /* Key name to store key or NULL */
+} KEYGEN_TEST_DATA;
+
+static int keygen_test_init(EVP_TEST *t, const char *alg)
+{
+ KEYGEN_TEST_DATA *data;
+ EVP_PKEY_CTX *genctx;
+ int nid = OBJ_sn2nid(alg);
+
+ if (nid == NID_undef) {
+ nid = OBJ_ln2nid(alg);
+ if (nid == NID_undef)
+ return 0;
+ }
+
+ if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_id(nid, NULL))) {
+ /* assume algorithm disabled */
+ t->skip = 1;
+ return 1;
+ }
+
+ if (EVP_PKEY_keygen_init(genctx) <= 0) {
+ t->err = "KEYGEN_INIT_ERROR";
+ goto err;
+ }
+
+ if (!TEST_ptr(data = OPENSSL_malloc(sizeof(*data))))
+ goto err;
+ data->genctx = genctx;
+ data->keyname = NULL;
+ t->data = data;
+ t->err = NULL;
+ return 1;
+
+err:
+ EVP_PKEY_CTX_free(genctx);
+ return 0;
+}
+
+static void keygen_test_cleanup(EVP_TEST *t)
+{
+ KEYGEN_TEST_DATA *keygen = t->data;
+
+ EVP_PKEY_CTX_free(keygen->genctx);
+ OPENSSL_free(keygen->keyname);
+ OPENSSL_free(t->data);
+ t->data = NULL;
+}
+
+static int keygen_test_parse(EVP_TEST *t,
+ const char *keyword, const char *value)
+{
+ KEYGEN_TEST_DATA *keygen = t->data;
+
+ if (strcmp(keyword, "KeyName") == 0)
+ return TEST_ptr(keygen->keyname = OPENSSL_strdup(value));
+ if (strcmp(keyword, "Ctrl") == 0)
+ return pkey_test_ctrl(t, keygen->genctx, value);
+ return 0;
+}
+
+static int keygen_test_run(EVP_TEST *t)
+{
+ KEYGEN_TEST_DATA *keygen = t->data;
+ EVP_PKEY *pkey = NULL;
+
+ t->err = NULL;
+ if (EVP_PKEY_keygen(keygen->genctx, &pkey) <= 0) {
+ t->err = "KEYGEN_GENERATE_ERROR";
+ goto err;
+ }
+
+ if (keygen->keyname != NULL) {
+ KEY_LIST *key;
+
+ if (find_key(NULL, keygen->keyname, private_keys)) {
+ TEST_info("Duplicate key %s", keygen->keyname);
+ goto err;
+ }
+
+ if (!TEST_ptr(key = OPENSSL_malloc(sizeof(*key))))
+ goto err;
+ key->name = keygen->keyname;
+ keygen->keyname = NULL;
+ key->key = pkey;
+ key->next = private_keys;
+ private_keys = key;
+ } else {
+ EVP_PKEY_free(pkey);
+ }
+
+ return 1;
+
+err:
+ EVP_PKEY_free(pkey);
+ return 0;
+}
+
+static const EVP_TEST_METHOD keygen_test_method = {
+ "KeyGen",
+ keygen_test_init,
+ keygen_test_cleanup,
+ keygen_test_parse,
+ keygen_test_run,
+};
/**
*** DIGEST SIGN+VERIFY TESTS
}
if (strcmp(keyword, "Ctrl") == 0) {
if (mdata->pctx == NULL)
- return 0;
+ return -1;
return pkey_test_ctrl(t, mdata->pctx, value);
}
return 0;
static int digestsign_test_run(EVP_TEST *t)
{
- DIGESTSIGN_DATA *mdata = t->data;
- unsigned char *buf = NULL;
- size_t buflen;
+ DIGESTSIGN_DATA *expected = t->data;
+ unsigned char *got = NULL;
+ size_t got_len;
- if (!evp_test_buffer_do(mdata->input, digestsign_update_fn, mdata->ctx)) {
+ if (!evp_test_buffer_do(expected->input, digestsign_update_fn,
+ expected->ctx)) {
t->err = "DIGESTUPDATE_ERROR";
goto err;
}
- if (!EVP_DigestSignFinal(mdata->ctx, NULL, &buflen)) {
+ if (!EVP_DigestSignFinal(expected->ctx, NULL, &got_len)) {
t->err = "DIGESTSIGNFINAL_LENGTH_ERROR";
goto err;
}
- if (!TEST_ptr(buf = OPENSSL_malloc(buflen))) {
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "MALLOC_FAILURE";
goto err;
}
- if (!EVP_DigestSignFinal(mdata->ctx, buf, &buflen)) {
+ if (!EVP_DigestSignFinal(expected->ctx, got, &got_len)) {
t->err = "DIGESTSIGNFINAL_ERROR";
goto err;
}
- if (!compare_mem(mdata->output, mdata->output_len, buf, buflen)) {
- t->err = "SIGNATURE_MISMATCH";
+ if (!memory_err_compare(t, "SIGNATURE_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
goto err;
- }
+ t->err = NULL;
err:
- OPENSSL_free(buf);
+ OPENSSL_free(got);
return 1;
}
static int oneshot_digestsign_test_run(EVP_TEST *t)
{
- DIGESTSIGN_DATA *mdata = t->data;
- unsigned char *buf = NULL;
- size_t buflen;
+ DIGESTSIGN_DATA *expected = t->data;
+ unsigned char *got = NULL;
+ size_t got_len;
- if (!EVP_DigestSign(mdata->ctx, NULL, &buflen, mdata->osin,
- mdata->osin_len)) {
+ if (!EVP_DigestSign(expected->ctx, NULL, &got_len,
+ expected->osin, expected->osin_len)) {
t->err = "DIGESTSIGN_LENGTH_ERROR";
goto err;
}
- if (!TEST_ptr(buf = OPENSSL_malloc(buflen))) {
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "MALLOC_FAILURE";
goto err;
}
- if (!EVP_DigestSign(mdata->ctx, buf, &buflen, mdata->osin,
- mdata->osin_len)) {
+ if (!EVP_DigestSign(expected->ctx, got, &got_len,
+ expected->osin, expected->osin_len)) {
t->err = "DIGESTSIGN_ERROR";
goto err;
}
- if (!compare_mem(mdata->output, mdata->output_len, buf, buflen)) {
- t->err = "SIGNATURE_MISMATCH";
+ if (!memory_err_compare(t, "SIGNATURE_MISMATCH",
+ expected->output, expected->output_len,
+ got, got_len))
goto err;
- }
+ t->err = NULL;
err:
- OPENSSL_free(buf);
+ OPENSSL_free(got);
return 1;
}
&digestverify_test_method,
&encode_test_method,
&kdf_test_method,
+ &pkey_kdf_test_method,
&keypair_test_method,
+ &keygen_test_method,
&mac_test_method,
&oneshot_digestsign_test_method,
&oneshot_digestverify_test_method,
static void clear_test(EVP_TEST *t)
{
+ test_clearstanza(&t->s);
ERR_clear_error();
if (t->data != NULL) {
if (t->meth != NULL)
}
OPENSSL_free(t->expected_err);
t->expected_err = NULL;
- OPENSSL_free(t->func);
- t->func = NULL;
OPENSSL_free(t->reason);
t->reason = NULL;
+
/* Text literal. */
t->err = NULL;
t->skip = 0;
return 1;
if (t->err != NULL && t->expected_err == NULL) {
if (t->aux_err != NULL) {
- TEST_info("Above error from the test at %s:%d "
- "(%s) unexpected error %s",
- current_test_file, t->start_line, t->aux_err, t->err);
+ TEST_info("%s:%d: Source of above error (%s); unexpected error %s",
+ t->s.test_file, t->s.start, t->aux_err, t->err);
} else {
- TEST_info("Above error from the test at %s:%d "
- "unexpected error %s",
- current_test_file, t->start_line, t->err);
+ TEST_info("%s:%d: Source of above error; unexpected error %s",
+ t->s.test_file, t->s.start, t->err);
}
return 0;
}
if (t->err == NULL && t->expected_err != NULL) {
- TEST_info("Test line %d: succeeded but was expecting %s",
- t->start_line, t->expected_err);
+ TEST_info("%s:%d: Succeeded but was expecting %s",
+ t->s.test_file, t->s.start, t->expected_err);
return 0;
}
if (strcmp(t->err, t->expected_err) != 0) {
- TEST_info("Test line %d: expecting %s got %s",
- t->start_line, t->expected_err, t->err);
+ TEST_info("%s:%d: Expected %s got %s",
+ t->s.test_file, t->s.start, t->expected_err, t->err);
return 0;
}
- if (t->func == NULL && t->reason == NULL)
+ if (t->reason == NULL)
return 1;
- if (t->func == NULL || t->reason == NULL) {
- TEST_info("Test line %d: missing function or reason code",
- t->start_line);
+ if (t->reason == NULL) {
+ TEST_info("%s:%d: Test is missing function or reason code",
+ t->s.test_file, t->s.start);
return 0;
}
err = ERR_peek_error();
if (err == 0) {
- TEST_info("Test line %d, expected error \"%s:%s\" not set",
- t->start_line, t->func, t->reason);
+ TEST_info("%s:%d: Expected error \"%s\" not set",
+ t->s.test_file, t->s.start, t->reason);
return 0;
}
func = ERR_func_error_string(err);
reason = ERR_reason_error_string(err);
if (func == NULL && reason == NULL) {
- TEST_info("Test line %d: expected error \"%s:%s\","
- " no strings available. Skipping...\n",
- t->start_line, t->func, t->reason);
+ TEST_info("%s:%d: Expected error \"%s\", no strings available."
+ " Assuming ok.",
+ t->s.test_file, t->s.start, t->reason);
return 1;
}
- if (strcmp(func, t->func) == 0 && strcmp(reason, t->reason) == 0)
+ if (strcmp(reason, t->reason) == 0)
return 1;
- TEST_info("Test line %d: expected error \"%s:%s\", got \"%s:%s\"",
- t->start_line, t->func, t->reason, func, reason);
+ TEST_info("%s:%d: Expected error \"%s\", got \"%s\"",
+ t->s.test_file, t->s.start, t->reason, reason);
return 0;
}
{
if (t->meth == NULL)
return 1;
- t->ntests++;
+ t->s.numtests++;
if (t->skip) {
- t->nskip++;
+ t->s.numskip++;
} else {
/* run the test */
if (t->err == NULL && t->meth->run_test(t) != 1) {
- TEST_info("Line %d error %s", t->start_line, t->meth->name);
+ TEST_info("%s:%d %s error",
+ t->s.test_file, t->s.start, t->meth->name);
return 0;
}
if (!check_test_error(t)) {
- test_openssl_errors();
- t->errors++;
+ TEST_openssl_errors();
+ t->s.errors++;
}
}
}
}
-
-/*
- * Read a line, remove the newline, return EOF or first char.
- * Comment lines are treated like empty lines.
- */
-static int read_line(EVP_TEST *t)
-{
- char *p;
-
- if (!BIO_gets(t->in, t->buf, sizeof(t->buf)))
- return EOF;
- t->line++;
- if ((p = strchr(t->buf, '\n')) != NULL)
- *p = '\0';
- if (t->buf[0] == '#')
- t->buf[0] = '\0';
- return t->buf[0];
-}
-
-/*
- * Skip leading spaces and remove trailing spaces from string.
- */
-static char *strip_spaces(char *pval)
-{
- char *p, *start;
-
- for (start = pval; isspace(*start); )
- start++;
- if (*start == '\0')
- return start;
-
- for (p = start + strlen(start); --p >= start && isspace(*p); )
- *p = '\0';
- return start;
-}
-
-/*
- * Split line into 'key = value'; return 1 if okay, 0 on error.
- */
-static int split_line(EVP_TEST *t, char **keyword, char **value)
-{
- char *p;
-
- /* Look for = sign */
- if ((p = strchr(t->buf, '=')) == NULL) {
- TEST_error("Line %d: Missing '=' in test file", t->line);
- return 0;
- }
- *p++ = '\0';
- *keyword = strip_spaces(t->buf);
- *value = strip_spaces(p);
- if (**keyword == '\0') {
- TEST_error("Line %d: Missing key; malformed input line", t->line);
- return 0;
- }
- return 1;
-}
-
-/*
- * Read a PEM block. Return 1 if okay, 0 on error.
- */
-static int read_key(EVP_TEST *t)
-{
- char tmpbuf[128];
-
- if (t->key == NULL) {
- if (!TEST_ptr(t->key = BIO_new(BIO_s_mem())))
- return 0;
- } else if (!TEST_int_gt(BIO_reset(t->key), 0)) {
- return 0;
- }
-
- /* Read to PEM end line and place content in memory BIO */
- while (BIO_gets(t->in, tmpbuf, sizeof(tmpbuf))) {
- t->line++;
- if (!TEST_int_gt(BIO_puts(t->key, tmpbuf), 0))
- return 0;
- if (strncmp(tmpbuf, "-----END", 8) == 0)
- return 1;
- }
- TEST_error("Can't find key end");
- return 0;
-}
-
/*
* Is the key type an unsupported algorithm?
*/
-static int key_unsupported()
+static int key_unsupported(void)
{
long err = ERR_peek_error();
}
/*
- * Read, parse, and execute one test. Return EOF; 0 if failure, 1 if okay.
+ * NULL out the value from |pp| but return it. This "steals" a pointer.
*/
-static int read_stanza(EVP_TEST *t)
+static char *take_value(PAIR *pp)
{
- int c;
- char *keyword, *value;
- KEY_LIST **klist, *key;
- EVP_PKEY *pkey;
+ char *p = pp->value;
- clear_test(t);
-top:
- /* Find the first line of a stanza. */
- for ( ; ; ) {
- c = read_line(t);
- if (c == EOF)
- return EOF;
- if (c == '\0')
+ pp->value = NULL;
+ return p;
+}
+
+/*
+ * Return 1 if one of the providers named in the string is available.
+ * The provider names are separated with whitespace.
+ * NOTE: destructive function, it inserts '\0' after each provider name.
+ */
+static int prov_available(char *providers)
+{
+ char *p;
+ int more = 1;
+
+ while (more) {
+ for (; isspace(*providers); providers++)
+ continue;
+ if (*providers == '\0')
+ break; /* End of the road */
+ for (p = providers; *p != '\0' && !isspace(*p); p++)
continue;
- break;
+ if (*p == '\0')
+ more = 0;
+ else
+ *p = '\0';
+ if (OSSL_PROVIDER_available(NULL, providers))
+ return 1; /* Found one */
}
- if (!split_line(t, &keyword, &value))
- return 0;
+ return 0;
+}
- /* Handle a few special cases here. */
- if (strcmp(keyword, "Title") == 0) {
- TEST_info("Starting \"%s\" tests", value);
- goto top;
- }
+/*
+ * Read and parse one test. Return 0 if failure, 1 if okay.
+ */
+static int parse(EVP_TEST *t)
+{
+ KEY_LIST *key, **klist;
+ EVP_PKEY *pkey;
+ PAIR *pp;
+ int i;
+
+top:
+ do {
+ if (BIO_eof(t->s.fp))
+ return EOF;
+ clear_test(t);
+ if (!test_readstanza(&t->s))
+ return 0;
+ } while (t->s.numpairs == 0);
+ pp = &t->s.pairs[0];
+ /* Are we adding a key? */
klist = NULL;
pkey = NULL;
- if (strcmp(keyword, "PrivateKey") == 0) {
- if (!read_key(t))
- return 0;
- pkey = PEM_read_bio_PrivateKey(t->key, NULL, 0, NULL);
+ if (strcmp(pp->key, "PrivateKey") == 0) {
+ pkey = PEM_read_bio_PrivateKey(t->s.key, NULL, 0, NULL);
if (pkey == NULL && !key_unsupported()) {
- TEST_info("Can't read private key %s", value);
- ERR_print_errors_fp(stderr);
+ EVP_PKEY_free(pkey);
+ TEST_info("Can't read private key %s", pp->value);
+ TEST_openssl_errors();
return 0;
}
klist = &private_keys;
- }
- else if (strcmp(keyword, "PublicKey") == 0) {
- if (!read_key(t))
- return 0;
- pkey = PEM_read_bio_PUBKEY(t->key, NULL, 0, NULL);
+ } else if (strcmp(pp->key, "PublicKey") == 0) {
+ pkey = PEM_read_bio_PUBKEY(t->s.key, NULL, 0, NULL);
if (pkey == NULL && !key_unsupported()) {
- TEST_info("Can't read public key %s", value);
- ERR_print_errors_fp(stderr);
+ EVP_PKEY_free(pkey);
+ TEST_info("Can't read public key %s", pp->value);
+ TEST_openssl_errors();
return 0;
}
klist = &public_keys;
+ } else if (strcmp(pp->key, "PrivateKeyRaw") == 0
+ || strcmp(pp->key, "PublicKeyRaw") == 0 ) {
+ char *strnid = NULL, *keydata = NULL;
+ unsigned char *keybin;
+ size_t keylen;
+ int nid;
+
+ if (strcmp(pp->key, "PrivateKeyRaw") == 0)
+ klist = &private_keys;
+ else
+ klist = &public_keys;
+
+ strnid = strchr(pp->value, ':');
+ if (strnid != NULL) {
+ *strnid++ = '\0';
+ keydata = strchr(strnid, ':');
+ if (keydata != NULL)
+ *keydata++ = '\0';
+ }
+ if (keydata == NULL) {
+ TEST_info("Failed to parse %s value", pp->key);
+ return 0;
+ }
+
+ nid = OBJ_txt2nid(strnid);
+ if (nid == NID_undef) {
+ TEST_info("Uncrecognised algorithm NID");
+ return 0;
+ }
+ if (!parse_bin(keydata, &keybin, &keylen)) {
+ TEST_info("Failed to create binary key");
+ return 0;
+ }
+ if (klist == &private_keys)
+ pkey = EVP_PKEY_new_raw_private_key(nid, NULL, keybin, keylen);
+ else
+ pkey = EVP_PKEY_new_raw_public_key(nid, NULL, keybin, keylen);
+ if (pkey == NULL && !key_unsupported()) {
+ TEST_info("Can't read %s data", pp->key);
+ OPENSSL_free(keybin);
+ TEST_openssl_errors();
+ return 0;
+ }
+ OPENSSL_free(keybin);
}
/* If we have a key add to list */
if (klist != NULL) {
- if (find_key(NULL, value, *klist)) {
- TEST_info("Duplicate key %s", value);
+ if (find_key(NULL, pp->value, *klist)) {
+ TEST_info("Duplicate key %s", pp->value);
return 0;
}
- if (!TEST_ptr(key = OPENSSL_malloc(sizeof(*key)))
- || !TEST_ptr(key->name = OPENSSL_strdup(value)))
+ if (!TEST_ptr(key = OPENSSL_malloc(sizeof(*key))))
return 0;
+ key->name = take_value(pp);
+
+ /* Hack to detect SM2 keys */
+ if(pkey != NULL && strstr(key->name, "SM2") != NULL) {
+#ifdef OPENSSL_NO_SM2
+ EVP_PKEY_free(pkey);
+ pkey = NULL;
+#else
+ EVP_PKEY_set_alias_type(pkey, EVP_PKEY_SM2);
+#endif
+ }
+
key->key = pkey;
key->next = *klist;
*klist = key;
/* Go back and start a new stanza. */
+ if (t->s.numpairs != 1)
+ TEST_info("Line %d: missing blank line\n", t->s.curr);
goto top;
}
- /* Start of a new text. Look it up. */
- if (!TEST_ptr(t->meth = find_test(keyword)))
- goto skiptoend;
- t->start_line = t->line;
- if (!t->meth->init(t, value)) {
- TEST_error("unknown %s: %s\n", keyword, value);
- goto skiptoend;
+ /* Find the test, based on first keyword. */
+ if (!TEST_ptr(t->meth = find_test(pp->key)))
+ return 0;
+ if (!t->meth->init(t, pp->value)) {
+ TEST_error("unknown %s: %s\n", pp->key, pp->value);
+ return 0;
}
if (t->skip == 1) {
- /* TEST_info("skipping %s %s", keyword, value); */
- goto skiptoend;
+ /* TEST_info("skipping %s %s", pp->key, pp->value); */
+ return 0;
}
- /* Read rest of stanza. */
- for ( ; ; ) {
- c = read_line(t);
- if (c == EOF)
- return c;
- if (c == '\0')
- break;
- if (!split_line(t, &keyword, &value))
- goto skiptoend;
- if (strcmp(keyword, "Result") == 0) {
- if (t->expected_err != NULL) {
- TEST_info("Line %d: multiple result lines", t->line);
- goto skiptoend;
+ for (pp++, i = 1; i < t->s.numpairs; pp++, i++) {
+ if (strcmp(pp->key, "Availablein") == 0) {
+ if (!prov_available(pp->value)) {
+ TEST_info("skipping, providers not available: %s:%d",
+ t->s.test_file, t->s.start);
+ t->skip = 1;
+ return 0;
}
- if (!TEST_ptr(t->expected_err = OPENSSL_strdup(value)))
- goto skiptoend;
- } else if (strcmp(keyword, "Function") == 0) {
- if (t->func != NULL) {
- TEST_info("Line %d: multiple function lines\n", t->line);
- goto skiptoend;
+ } else if (strcmp(pp->key, "Result") == 0) {
+ if (t->expected_err != NULL) {
+ TEST_info("Line %d: multiple result lines", t->s.curr);
+ return 0;
}
- if (!TEST_ptr(t->func = OPENSSL_strdup(value)))
- goto skiptoend;
- } else if (strcmp(keyword, "Reason") == 0) {
+ t->expected_err = take_value(pp);
+ } else if (strcmp(pp->key, "Function") == 0) {
+ /* Ignore old line. */
+ } else if (strcmp(pp->key, "Reason") == 0) {
if (t->reason != NULL) {
- TEST_info("Line %d: multiple reason lines", t->line);
- goto skiptoend;
+ TEST_info("Line %d: multiple reason lines", t->s.curr);
+ return 0;
}
- if (!TEST_ptr(t->reason = OPENSSL_strdup(value)))
- goto skiptoend;
+ t->reason = take_value(pp);
} else {
/* Must be test specific line: try to parse it */
- int rv = t->meth->parse(t, keyword, value);
+ int rv = t->meth->parse(t, pp->key, pp->value);
if (rv == 0) {
- TEST_info("Line %d: unknown keyword %s", t->line, keyword);
- goto skiptoend;
+ TEST_info("Line %d: unknown keyword %s", t->s.curr, pp->key);
+ return 0;
}
if (rv < 0) {
- TEST_info("Line %d: error processing keyword %s\n",
- t->line, keyword);
- goto skiptoend;
+ TEST_info("Line %d: error processing keyword %s = %s\n",
+ t->s.curr, pp->key, pp->value);
+ return 0;
}
}
}
return 1;
-
-skiptoend:
- /* Read to end of stanza and return failure */
- for ( ; ; ) {
- c = read_line(t);
- if (c == EOF)
- return EOF;
- if (c == '\0')
- break;
- }
- return 0;
}
-static int do_test_file(const char *testfile)
+static int run_file_tests(int i)
{
- BIO *in;
- EVP_TEST t;
+ EVP_TEST *t;
+ const char *testfile = test_get_argument(i);
int c;
- set_test_title(testfile);
- current_test_file = testfile;
- if (!TEST_ptr(in = BIO_new_file(testfile, "rb")))
+ if (!TEST_ptr(t = OPENSSL_zalloc(sizeof(*t))))
return 0;
- memset(&t, 0, sizeof(t));
- t.in = in;
+ if (!test_start_file(&t->s, testfile)) {
+ OPENSSL_free(t);
+ return 0;
+ }
- TEST_info("Reading %s", testfile);
- for ( ; ; ) {
- c = read_stanza(&t);
- if (t.skip)
+ while (!BIO_eof(t->s.fp)) {
+ c = parse(t);
+ if (t->skip) {
+ t->s.numskip++;
continue;
- if (c == 0 || !run_test(&t)) {
- t.errors++;
- break;
}
- if (c == EOF)
+ if (c == 0 || !run_test(t)) {
+ t->s.errors++;
break;
+ }
}
- clear_test(&t);
+ test_end_file(&t->s);
+ clear_test(t);
- TEST_info("Completed %d tests with %d errors and %d skipped",
- t.ntests, t.errors, t.nskip);
free_key_list(public_keys);
free_key_list(private_keys);
- BIO_free(t.key);
- BIO_free(in);
- return t.errors == 0;
+ BIO_free(t->s.key);
+ c = t->s.errors;
+ OPENSSL_free(t);
+ return c == 0;
}
-static char * const *testfiles;
+OPT_TEST_DECLARE_USAGE("file...\n")
-static int run_file_tests(int i)
+int setup_tests(void)
{
- return do_test_file(testfiles[i]);
-}
+ size_t n = test_get_argument_count();
-int test_main(int argc, char *argv[])
-{
- if (argc < 2) {
- TEST_error("Usage: %s file...", argv[0]);
+ if (n == 0)
return 0;
- }
- testfiles = &argv[1];
- ADD_ALL_TESTS(run_file_tests, argc - 1);
-
- return run_tests(argv[0]);
+ ADD_ALL_TESTS(run_file_tests, n);
+ return 1;
}