* 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 */
static int parse_bin(const char *value, unsigned char **buf, size_t *buflen);
-static const char *current_test_file = "???";
-
/*
* Structure used to hold a list of blocks of memory to test
* calls to "update" like functions.
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[EVP_MAX_MD_SIZE];
+ 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)) {
+ 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)) {
+ 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)) {
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
t->err = "DIGEST_MISMATCH";
goto err;
}
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;
EVP_CIPHER_CTX *ctx = NULL;
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) {
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 (!enc && expected->aead == EVP_CIPH_OCB_MODE) {
if (!EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG,
- cdat->tag_len, cdat->tag)) {
+ expected->tag_len, expected->tag)) {
t->err = "TAG_SET_ERROR";
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) {
t->err = "AAD_SET_ERROR";
if (!frag) {
- if (!EVP_CipherUpdate(ctx, NULL, &chunklen, cdat->aad,
- cdat->aad_len))
+ if (!EVP_CipherUpdate(ctx, NULL, &chunklen, expected->aad,
+ expected->aad_len))
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))
+ if (expected->aad_len > 0) {
+ if (!EVP_CipherUpdate(ctx, NULL, &chunklen, expected->aad, 1))
goto err;
donelen++;
}
- if (cdat->aad_len > 2) {
- if (!EVP_CipherUpdate(ctx, NULL, &chunklen, cdat->aad + donelen,
- cdat->aad_len - 2))
+ if (expected->aad_len > 2) {
+ if (!EVP_CipherUpdate(ctx, NULL, &chunklen,
+ expected->aad + donelen,
+ expected->aad_len - 2))
goto err;
- donelen += cdat->aad_len - 2;
+ donelen += expected->aad_len - 2;
}
- if (cdat->aad_len > 1
+ if (expected->aad_len > 1
&& !EVP_CipherUpdate(ctx, NULL, &chunklen,
- cdat->aad + donelen, 1))
+ expected->aad + donelen, 1))
goto err;
}
}
t->err = "CIPHERFINAL_ERROR";
goto err;
}
- if (!compare_mem(out, out_len, tmp + out_misalign, tmplen + tmpflen)) {
+ if (!TEST_mem_eq(expected_out, out_len,
+ tmp + out_misalign, tmplen + tmpflen)) {
t->err = "VALUE_MISMATCH";
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)) {
+ if (!TEST_mem_eq(expected->tag, expected->tag_len,
+ rtag, expected->tag_len)) {
t->err = "TAG_VALUE_MISMATCH";
goto err;
}
*/
if (cdat->aead == EVP_CIPH_CCM_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++;
static int mac_test_run(EVP_TEST *t)
{
- MAC_DATA *mdata = t->data;
+ 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;
#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))) {
+ if (!TEST_ptr(genctx = EVP_PKEY_CTX_new_id(expected->type, NULL))) {
t->err = "MAC_PKEY_CTX_ERROR";
goto err;
}
t->err = "MAC_KEYGEN_INIT_ERROR";
goto err;
}
- if (mdata->type == EVP_PKEY_CMAC
- && EVP_PKEY_CTX_ctrl_str(genctx, "cipher", mdata->alg) <= 0) {
+ if (expected->type == EVP_PKEY_CMAC
+ && EVP_PKEY_CTX_ctrl_str(genctx, "cipher", expected->alg) <= 0) {
t->err = "MAC_ALGORITHM_SET_ERROR";
goto err;
}
- if (EVP_PKEY_CTX_set_mac_key(genctx, mdata->key, mdata->key_len) <= 0) {
+ if (EVP_PKEY_CTX_set_mac_key(genctx, expected->key,
+ expected->key_len) <= 0) {
t->err = "MAC_KEY_SET_ERROR";
goto err;
}
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;
}
goto err;
}
- if (!EVP_DigestSignUpdate(mctx, mdata->input, mdata->input_len)) {
+ 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)
+ || !TEST_mem_eq(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;
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;
- 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)) {
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
t->err = "KEYOP_MISMATCH";
goto err;
}
t->err = NULL;
err:
- OPENSSL_free(out);
+ OPENSSL_free(got);
return 1;
}
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))) {
+ got_len = expected->output_len;
+ if (!TEST_ptr(got = OPENSSL_malloc(got_len))) {
t->err = "DERIVE_ERROR";
goto err;
}
- if (EVP_PKEY_derive(kdata->ctx, out, &out_len) <= 0) {
+ if (EVP_PKEY_derive(expected->ctx, got, &got_len) <= 0) {
t->err = "DERIVE_ERROR";
goto err;
}
- if (!compare_mem(kdata->output, kdata->output_len, out, out_len)) {
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
t->err = "SHARED_SECRET_MISMATCH";
goto err;
}
t->err = NULL;
err:
- OPENSSL_free(out);
+ OPENSSL_free(got);
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)) {
+ if (!TEST_mem_eq(expected->key, expected->key_len,
+ key, expected->key_len)) {
t->err = "KEY_MISMATCH";
goto err;
}
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;
goto err;
}
- if (edata->encoding == BASE64_CANONICAL_ENCODING) {
+ if (expected->encoding == BASE64_CANONICAL_ENCODING) {
EVP_ENCODE_CTX *encode_ctx;
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);
+ expected->input, expected->input_len);
output_len = chunk_len;
EVP_EncodeFinal(encode_ctx, encode_out + chunk_len, &chunk_len);
EVP_ENCODE_CTX_free(encode_ctx);
- if (!compare_mem(edata->output, edata->output_len,
+ if (!TEST_mem_eq(expected->output, expected->output_len,
encode_out, output_len)) {
t->err = "BAD_ENCODING";
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,
+ if (expected->encoding != BASE64_INVALID_ENCODING
+ && !TEST_mem_eq(expected->input, expected->input_len,
decode_out, output_len)) {
t->err = "BAD_DECODING";
goto err;
if (!TEST_ptr(kdata = OPENSSL_zalloc(sizeof(*kdata))))
return 0;
kdata->ctx = EVP_PKEY_CTX_new_id(OBJ_sn2nid(name), NULL);
- if (kdata->ctx == NULL)
+ if (kdata->ctx == NULL) {
+ OPENSSL_free(kdata);
return 0;
- if (EVP_PKEY_derive_init(kdata->ctx) <= 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 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_PKEY_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)) {
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
t->err = "KDF_MISMATCH";
goto err;
}
t->err = NULL;
err:
- OPENSSL_free(out);
+ OPENSSL_free(got);
return 1;
}
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)) {
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
t->err = "SIGNATURE_MISMATCH";
goto err;
}
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)) {
+ if (!TEST_mem_eq(expected->output, expected->output_len, got, got_len)) {
t->err = "SIGNATURE_MISMATCH";
goto err;
}
err:
- OPENSSL_free(buf);
+ OPENSSL_free(got);
return 1;
}
static void clear_test(EVP_TEST *t)
{
+ test_clearstanza(&t->s);
ERR_clear_error();
if (t->data != NULL) {
if (t->meth != NULL)
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;
}
return 1;
if (t->func == NULL || t->reason == NULL) {
- TEST_info("Test line %d: missing function or reason code",
- t->start_line);
+ 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:%s\" not set",
+ t->s.test_file, t->s.start, t->func, 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:%s\", no strings available."
+ " Assuming ok.",
+ t->s.test_file, t->s.start, t->func, t->reason);
return 1;
}
if (strcmp(func, t->func) == 0 && 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:%s\", got \"%s:%s\"",
+ t->s.test_file, t->s.start, t->func, t->reason, func, 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?
*/
}
/*
- * 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;
+ char *p = pp->value;
+
+ pp->value = NULL;
+ return p;
+}
+
+/*
+ * 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;
- clear_test(t);
top:
- /* Find the first line of a stanza. */
- for ( ; ; ) {
- c = read_line(t);
- if (c == EOF)
+ do {
+ if (BIO_eof(t->s.fp))
return EOF;
- if (c == '\0')
- continue;
- break;
- }
- if (!split_line(t, &keyword, &value))
- return 0;
-
- /* Handle a few special cases here. */
- if (strcmp(keyword, "Title") == 0) {
- TEST_info("Starting \"%s\" tests", value);
- goto top;
- }
+ 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);
+ 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);
+ TEST_info("Can't read public key %s", pp->value);
+ TEST_openssl_errors();
return 0;
}
klist = &public_keys;
/* 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);
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) {
+ for (pp++, i = 1; i < t->s.numpairs; pp++, i++) {
+ if (strcmp(pp->key, "Result") == 0) {
if (t->expected_err != NULL) {
- TEST_info("Line %d: multiple result lines", t->line);
- goto skiptoend;
+ TEST_info("Line %d: multiple result lines", t->s.curr);
+ return 0;
}
- if (!TEST_ptr(t->expected_err = OPENSSL_strdup(value)))
- goto skiptoend;
- } else if (strcmp(keyword, "Function") == 0) {
+ t->expected_err = take_value(pp);
+ } else if (strcmp(pp->key, "Function") == 0) {
if (t->func != NULL) {
- TEST_info("Line %d: multiple function lines\n", t->line);
- goto skiptoend;
+ TEST_info("Line %d: multiple function lines\n", t->s.curr);
+ return 0;
}
- if (!TEST_ptr(t->func = OPENSSL_strdup(value)))
- goto skiptoend;
- } else if (strcmp(keyword, "Reason") == 0) {
+ t->func = take_value(pp);
+ } 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;
+ t->s.curr, pp->key);
+ 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 char * const *testfiles;
+
+static int run_file_tests(int i)
{
- BIO *in;
- EVP_TEST t;
+ EVP_TEST *t;
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;
+ if (!test_start_file(&t->s, testfiles[i])) {
+ OPENSSL_free(t);
return 0;
- memset(&t, 0, sizeof(t));
- t.in = in;
+ }
- 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)
continue;
- if (c == 0 || !run_test(&t)) {
- t.errors++;
+ if (c == 0 || !run_test(t)) {
+ t->s.errors++;
break;
}
- if (c == EOF)
- 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;
-}
-
-static char * const *testfiles;
-
-static int run_file_tests(int i)
-{
- return do_test_file(testfiles[i]);
+ BIO_free(t->s.key);
+ c = t->s.errors;
+ OPENSSL_free(t);
+ return c == 0;
}
int test_main(int argc, char *argv[])
projects / openssl.git / blobdiff