diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/kem.c | 5 | ||||
| -rw-r--r-- | common/sexputil.c | 6 | ||||
| -rw-r--r-- | common/util.h | 3 |
3 files changed, 7 insertions, 7 deletions
diff --git a/common/kem.c b/common/kem.c index 6d1e2e442..65e533a83 100644 --- a/common/kem.c +++ b/common/kem.c @@ -156,7 +156,7 @@ gnupg_ecc_kem_kdf (void *kek, size_t kek_len, int hashalgo, const void *ecdh, size_t ecdh_len, const void *ecc_ct, size_t ecc_ct_len, const void *ecc_pk, size_t ecc_pk_len, - gcry_buffer_t *kdf_params) + unsigned char *kdf_params, size_t kdf_params_len) { if (kdf_params) { @@ -168,8 +168,7 @@ gnupg_ecc_kem_kdf (void *kek, size_t kek_len, param[0] = kek_len; err = gcry_kdf_open (&hd, GCRY_KDF_ONESTEP_KDF, hashalgo, param, 1, ecdh, ecdh_len, NULL, 0, NULL, 0, - (char *)kdf_params->data+kdf_params->off, - kdf_params->len); + kdf_params, kdf_params_len); if (!err) { gcry_kdf_compute (hd, NULL); diff --git a/common/sexputil.c b/common/sexputil.c index e00590ac7..fcd15ebc6 100644 --- a/common/sexputil.c +++ b/common/sexputil.c @@ -784,11 +784,11 @@ uncompress_ecc_q_in_canon_sexp (const unsigned char *keydata, return err; if (!tok) return gpg_error (GPG_ERR_BAD_PUBKEY); - else if (toklen == 10 || !memcmp ("public-key", tok, toklen)) + else if (toklen == 10 && !memcmp ("public-key", tok, toklen)) ; - else if (toklen == 11 || !memcmp ("private-key", tok, toklen)) + else if (toklen == 11 && !memcmp ("private-key", tok, toklen)) ; - else if (toklen == 20 || !memcmp ("shadowed-private-key", tok, toklen)) + else if (toklen == 20 && !memcmp ("shadowed-private-key", tok, toklen)) ; else return gpg_error (GPG_ERR_BAD_PUBKEY); diff --git a/common/util.h b/common/util.h index 731b85ef7..20456349c 100644 --- a/common/util.h +++ b/common/util.h @@ -306,7 +306,8 @@ gpg_error_t gnupg_ecc_kem_kdf (void *kek, size_t kek_len, int hashalgo, const void *ecdh, size_t ecdh_len, const void *ecc_ct, size_t ecc_ct_len, const void *ecc_pk, size_t ecc_pk_len, - gcry_buffer_t *kdf_params); + unsigned char *kdf_params, + size_t kdf_params_len); gpg_error_t gnupg_kem_combiner (void *kek, size_t kek_len, const void *ecc_ss, size_t ecc_ss_len, |