struct evp_test {
/* file being read */
BIO *in;
+ /* temp memory BIO for reading in keys */
+ BIO *key;
/* List of public and private keys */
struct key_list *private;
struct key_list *public;
const char *err, *aux_err;
/* Expected error value of test */
char *expected_err;
+ /* Expected error function string */
+ char *func;
+ /* Expected error reason string */
+ char *reason;
/* Number of tests */
int ntests;
/* Error count */
{
OPENSSL_free(t->expected_err);
t->expected_err = NULL;
+ OPENSSL_free(t->func);
+ t->func = NULL;
+ OPENSSL_free(t->reason);
+ t->reason = NULL;
OPENSSL_free(t->out_expected);
OPENSSL_free(t->out_received);
t->out_expected = NULL;
static int check_test_error(struct evp_test *t)
{
+ unsigned long err;
+ const char *func;
+ const char *reason;
if (!t->err && !t->expected_err)
return 1;
if (t->err && !t->expected_err) {
t->start_line, t->expected_err);
return 0;
}
- if (strcmp(t->err, t->expected_err) == 0)
+
+ if (strcmp(t->err, t->expected_err) != 0) {
+ fprintf(stderr, "Test line %d: expecting %s got %s\n",
+ t->start_line, t->expected_err, t->err);
+ return 0;
+ }
+
+ if (t->func == NULL && t->reason == NULL)
+ return 1;
+
+ if (t->func == NULL || t->reason == NULL) {
+ fprintf(stderr, "Test line %d: missing function or reason code\n",
+ t->start_line);
+ return 0;
+ }
+
+ err = ERR_peek_error();
+ if (err == 0) {
+ fprintf(stderr, "Test line %d, expected error \"%s:%s\" not set\n",
+ t->start_line, t->func, t->reason);
+ return 0;
+ }
+
+ func = ERR_func_error_string(err);
+ reason = ERR_reason_error_string(err);
+
+ if (func == NULL && reason == NULL) {
+ fprintf(stderr, "Test line %d: expected error \"%s:%s\", no strings available. Skipping...\n",
+ t->start_line, t->func, t->reason);
return 1;
+ }
+
+ if (strcmp(func, t->func) == 0 && strcmp(reason, t->reason) == 0)
+ return 1;
+
+ fprintf(stderr, "Test line %d: expected error \"%s:%s\", got \"%s:%s\"\n",
+ t->start_line, t->func, t->reason, func, reason);
- fprintf(stderr, "Test line %d: expecting %s got %s\n",
- t->start_line, t->expected_err, t->err);
return 0;
}
if (t->meth) {
t->ntests++;
if (t->skip) {
- t->meth = tmeth;
t->nskip++;
- return 1;
- }
- t->err = NULL;
- if (t->meth->run_test(t) != 1) {
- fprintf(stderr, "%s test error line %d\n",
- t->meth->name, t->start_line);
- return 0;
- }
- if (!check_test_error(t)) {
- if (t->err)
- ERR_print_errors_fp(stderr);
- t->errors++;
+ } else {
+ /* run the test */
+ if (t->err == NULL && t->meth->run_test(t) != 1) {
+ fprintf(stderr, "%s test error line %d\n",
+ t->meth->name, t->start_line);
+ return 0;
+ }
+ if (!check_test_error(t)) {
+ if (t->err)
+ ERR_print_errors_fp(stderr);
+ t->errors++;
+ }
}
+ /* clean it up */
ERR_clear_error();
- t->meth->cleanup(t);
- OPENSSL_free(t->data);
- t->data = NULL;
+ if (t->data != NULL) {
+ t->meth->cleanup(t);
+ OPENSSL_free(t->data);
+ t->data = NULL;
+ }
OPENSSL_free(t->expected_err);
t->expected_err = NULL;
free_expected(t);
return 0;
}
+
+static int read_key(struct evp_test *t)
+{
+ char tmpbuf[80];
+ if (t->key == NULL)
+ t->key = BIO_new(BIO_s_mem());
+ else if (BIO_reset(t->key) <= 0)
+ return 0;
+ if (t->key == NULL) {
+ fprintf(stderr, "Error allocating key memory BIO\n");
+ return 0;
+ }
+ /* Read to PEM end line and place content in memory BIO */
+ while (BIO_gets(t->in, tmpbuf, sizeof(tmpbuf))) {
+ t->line++;
+ if (BIO_puts(t->key, tmpbuf) <= 0) {
+ fprintf(stderr, "Error writing to key memory BIO\n");
+ return 0;
+ }
+ if (strncmp(tmpbuf, "-----END", 8) == 0)
+ return 1;
+ }
+ fprintf(stderr, "Can't find key end\n");
+ return 0;
+}
+
static int process_test(struct evp_test *t, char *buf, int verbose)
{
char *keyword = NULL, *value = NULL;
int rv = 0, add_key = 0;
- long save_pos = 0;
struct key_list **lst = NULL, *key = NULL;
EVP_PKEY *pk = NULL;
const struct evp_test_method *tmeth = NULL;
if (!parse_line(&keyword, &value, buf))
return 1;
if (strcmp(keyword, "PrivateKey") == 0) {
- save_pos = BIO_tell(t->in);
- pk = PEM_read_bio_PrivateKey(t->in, NULL, 0, NULL);
+ if (!read_key(t))
+ return 0;
+ pk = PEM_read_bio_PrivateKey(t->key, NULL, 0, NULL);
if (pk == NULL && !check_unsupported()) {
fprintf(stderr, "Error reading private key %s\n", value);
ERR_print_errors_fp(stderr);
add_key = 1;
}
if (strcmp(keyword, "PublicKey") == 0) {
- save_pos = BIO_tell(t->in);
- pk = PEM_read_bio_PUBKEY(t->in, NULL, 0, NULL);
+ if (!read_key(t))
+ return 0;
+ pk = PEM_read_bio_PUBKEY(t->key, NULL, 0, NULL);
if (pk == NULL && !check_unsupported()) {
fprintf(stderr, "Error reading public key %s\n", value);
ERR_print_errors_fp(stderr);
}
/* If we have a key add to list */
if (add_key) {
- char tmpbuf[80];
if (find_key(NULL, value, *lst)) {
fprintf(stderr, "Duplicate key %s\n", value);
return 0;
key->key = pk;
key->next = *lst;
*lst = key;
- /* Rewind input, read to end and update line numbers */
- (void)BIO_seek(t->in, save_pos);
- while (BIO_gets(t->in,tmpbuf, sizeof(tmpbuf))) {
- t->line++;
- if (strncmp(tmpbuf, "-----END", 8) == 0)
- return 1;
- }
- fprintf(stderr, "Can't find key end\n");
- return 0;
+ return 1;
}
/* See if keyword corresponds to a test start */
return 0;
}
t->expected_err = OPENSSL_strdup(value);
- if (!t->expected_err)
+ if (t->expected_err == NULL)
+ return 0;
+ } else if (strcmp(keyword, "Function") == 0) {
+ if (t->func != NULL) {
+ fprintf(stderr, "Line %d: multiple function lines\n", t->line);
+ return 0;
+ }
+ t->func = OPENSSL_strdup(value);
+ if (t->func == NULL)
+ return 0;
+ } else if (strcmp(keyword, "Reason") == 0) {
+ if (t->reason != NULL) {
+ fprintf(stderr, "Line %d: multiple reason lines\n", t->line);
+ return 0;
+ }
+ t->reason = OPENSSL_strdup(value);
+ if (t->reason == NULL)
return 0;
} else {
/* Must be test specific line: try to parse it */
return 1;
}
t.in = in;
+ t.err = NULL;
while (BIO_gets(in, buf, sizeof(buf))) {
t.line++;
if (!process_test(&t, buf, 0))
t.ntests, t.errors, t.nskip);
free_key_list(t.public);
free_key_list(t.private);
+ BIO_free(t.key);
BIO_free(in);
#ifndef OPENSSL_NO_CRYPTO_MDEBUG
rv = find_key(&pkey, name, t->public);
if (!rv)
rv = find_key(&pkey, name, t->private);
- if (!rv)
- return 0;
- if (!pkey) {
+ if (!rv || pkey == NULL) {
t->skip = 1;
return 1;
}
if (!kdata->ctx)
return 0;
if (keyopinit(kdata->ctx) <= 0)
- return 0;
+ t->err = "KEYOP_INIT_ERROR";
return 1;
}
if (p != NULL)
*p++ = 0;
rv = EVP_PKEY_CTX_ctrl_str(pctx, tmpval, p);
- if (p != NULL && rv <= 0 && rv != -2) {
- /* If p has an OID assume disabled algorithm */
- if (OBJ_sn2nid(p) != NID_undef || OBJ_ln2nid(p) != NID_undef) {
+ if (rv == -2) {
+ t->err = "PKEY_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 = "PKEY_CTRL_ERROR";
+ rv = 1;
}
}
OPENSSL_free(tmpval);
projects / openssl.git / blobdiff