static const struct evp_test_method *evp_find_test(const char *name)
{
const struct evp_test_method **tt;
+
for (tt = evp_test_list; *tt; tt++) {
- if (!strcmp(name, (*tt)->name))
+ if (strcmp(name, (*tt)->name) == 0)
return *tt;
}
return NULL;
{
OPENSSL_free(t->expected_err);
t->expected_err = NULL;
- if (t->out_expected) {
- OPENSSL_free(t->out_expected);
- OPENSSL_free(t->out_got);
- t->out_expected = NULL;
- t->out_got = NULL;
- }
+ OPENSSL_free(t->out_expected);
+ OPENSSL_free(t->out_got);
+ t->out_expected = NULL;
+ t->out_got = NULL;
}
static void print_expected(struct evp_test *t)
t->start_line, t->expected_err);
return 0;
}
- if (!strcmp(t->err, t->expected_err))
+ if (strcmp(t->err, t->expected_err) == 0)
return 1;
fprintf(stderr, "Test line %d: expecting %s got %s\n",
static int find_key(EVP_PKEY **ppk, const char *name, struct key_list *lst)
{
for (; lst; lst = lst->next) {
- if (!strcmp(lst->name, name)) {
+ if (strcmp(lst->name, name) == 0) {
if (ppk)
*ppk = lst->key;
return 1;
static int process_test(struct evp_test *t, char *buf, int verbose)
{
- char *keyword, *value;
+ char *keyword = NULL, *value = NULL;
int rv = 0, add_key = 0;
- long save_pos;
- struct key_list **lst, *key;
+ long save_pos = 0;
+ struct key_list **lst = NULL, *key = NULL;
EVP_PKEY *pk = NULL;
- const struct evp_test_method *tmeth;
+ const struct evp_test_method *tmeth = NULL;
if (verbose)
fputs(buf, stdout);
if (!parse_line(&keyword, &value, buf))
return 1;
- if (!strcmp(keyword, "PrivateKey")) {
+ if (strcmp(keyword, "PrivateKey") == 0) {
save_pos = ftell(t->in);
pk = PEM_read_PrivateKey(t->in, NULL, 0, NULL);
if (pk == NULL && !check_unsupported()) {
lst = &t->private;
add_key = 1;
}
- if (!strcmp(keyword, "PublicKey")) {
+ if (strcmp(keyword, "PublicKey") == 0) {
save_pos = ftell(t->in);
pk = PEM_read_PUBKEY(t->in, NULL, 0, NULL);
if (pk == NULL && !check_unsupported()) {
fprintf(stderr, "Duplicate key %s\n", value);
return 0;
}
- key = OPENSSL_malloc(sizeof(struct key_list));
+ key = OPENSSL_malloc(sizeof(*key));
if (!key)
return 0;
key->name = BUF_strdup(value);
fseek(t->in, save_pos, SEEK_SET);
while (fgets(tmpbuf, sizeof(tmpbuf), t->in)) {
t->line++;
- if (!strncmp(tmpbuf, "-----END", 8))
+ if (strncmp(tmpbuf, "-----END", 8) == 0)
return 1;
}
fprintf(stderr, "Can't find key end\n");
return 1;
} else if (t->skip) {
return 1;
- } else if (!strcmp(keyword, "Result")) {
+ } else if (strcmp(keyword, "Result") == 0) {
if (t->expected_err) {
fprintf(stderr, "Line %d: multiple result lines\n", t->line);
return 0;
}
return 0;
}
- mdat = OPENSSL_malloc(sizeof(struct digest_data));
+ mdat = OPENSSL_malloc(sizeof(*mdat));
mdat->digest = digest;
mdat->input = NULL;
mdat->output = NULL;
const char *keyword, const char *value)
{
struct digest_data *mdata = t->data;
- if (!strcmp(keyword, "Input"))
+ if (strcmp(keyword, "Input") == 0)
return test_bin(value, &mdata->input, &mdata->input_len);
- if (!strcmp(keyword, "Output"))
+ if (strcmp(keyword, "Output") == 0)
return test_bin(value, &mdata->output, &mdata->output_len);
- if (!strcmp(keyword, "Count")) {
+ if (strcmp(keyword, "Count") == 0) {
long nrpt = atoi(value);
if (nrpt <= 0)
return 0;
}
return 0;
}
- cdat = OPENSSL_malloc(sizeof(struct cipher_data));
+ cdat = OPENSSL_malloc(sizeof(*cdat));
cdat->cipher = cipher;
cdat->enc = -1;
cdat->key = NULL;
const char *value)
{
struct cipher_data *cdat = t->data;
- if (!strcmp(keyword, "Key"))
+ if (strcmp(keyword, "Key") == 0)
return test_bin(value, &cdat->key, &cdat->key_len);
- if (!strcmp(keyword, "IV"))
+ if (strcmp(keyword, "IV") == 0)
return test_bin(value, &cdat->iv, &cdat->iv_len);
- if (!strcmp(keyword, "Plaintext"))
+ if (strcmp(keyword, "Plaintext") == 0)
return test_bin(value, &cdat->plaintext, &cdat->plaintext_len);
- if (!strcmp(keyword, "Ciphertext"))
+ if (strcmp(keyword, "Ciphertext") == 0)
return test_bin(value, &cdat->ciphertext, &cdat->ciphertext_len);
if (cdat->aead) {
- if (!strcmp(keyword, "AAD"))
+ if (strcmp(keyword, "AAD") == 0)
return test_bin(value, &cdat->aad, &cdat->aad_len);
- if (!strcmp(keyword, "Tag"))
+ if (strcmp(keyword, "Tag") == 0)
return test_bin(value, &cdat->tag, &cdat->tag_len);
}
- if (!strcmp(keyword, "Operation")) {
- if (!strcmp(value, "ENCRYPT"))
+ if (strcmp(keyword, "Operation") == 0) {
+ if (strcmp(value, "ENCRYPT") == 0)
cdat->enc = 1;
- else if (!strcmp(value, "DECRYPT"))
+ else if (strcmp(value, "DECRYPT") == 0)
cdat->enc = 0;
else
return 0;
{
int type;
struct mac_data *mdat;
- if (!strcmp(alg, "HMAC"))
+ if (strcmp(alg, "HMAC") == 0)
type = EVP_PKEY_HMAC;
- else if (!strcmp(alg, "CMAC"))
+ else if (strcmp(alg, "CMAC") == 0)
type = EVP_PKEY_CMAC;
else
return 0;
- mdat = OPENSSL_malloc(sizeof(struct mac_data));
+ mdat = OPENSSL_malloc(sizeof(*mdat));
mdat->type = type;
mdat->alg = NULL;
mdat->key = NULL;
const char *keyword, const char *value)
{
struct mac_data *mdata = t->data;
- if (!strcmp(keyword, "Key"))
+ if (strcmp(keyword, "Key") == 0)
return test_bin(value, &mdata->key, &mdata->key_len);
- if (!strcmp(keyword, "Algorithm")) {
+ if (strcmp(keyword, "Algorithm") == 0) {
mdata->alg = BUF_strdup(value);
if (!mdata->alg)
return 0;
return 1;
}
- if (!strcmp(keyword, "Input"))
+ if (strcmp(keyword, "Input") == 0)
return test_bin(value, &mdata->input, &mdata->input_len);
- if (!strcmp(keyword, "Output"))
+ if (strcmp(keyword, "Output") == 0)
return test_bin(value, &mdata->output, &mdata->output_len);
return 0;
}
return 1;
}
- kdata = OPENSSL_malloc(sizeof(struct pkey_data));
+ kdata = OPENSSL_malloc(sizeof(*kdata));
if (!kdata) {
EVP_PKEY_free(pkey);
return 0;
const char *keyword, const char *value)
{
struct pkey_data *kdata = t->data;
- if (!strcmp(keyword, "Input"))
+ if (strcmp(keyword, "Input") == 0)
return test_bin(value, &kdata->input, &kdata->input_len);
- if (!strcmp(keyword, "Output"))
+ if (strcmp(keyword, "Output") == 0)
return test_bin(value, &kdata->output, &kdata->output_len);
- if (!strcmp(keyword, "Ctrl")) {
+ if (strcmp(keyword, "Ctrl") == 0) {
char *p = strchr(value, ':');
if (p)
*p++ = 0;