diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-10-09 12:09:52 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-10-09 12:15:00 +0200 |
| commit | 62bde4c62d4b89ef070c39ca4f0e6625ffc18c9f (patch) | |
| tree | 9997f7c44a22de9398539724bc2e517b47640918 /lib/x509 | |
| parent | ab858f99d5f847117ce052d847918b4c761b07df (diff) | |
| download | gnutls-62bde4c62d4b89ef070c39ca4f0e6625ffc18c9f.tar.gz | |
pkcs11: simplified and optimized loop
Diffstat (limited to 'lib/x509')
| -rw-r--r-- | lib/x509/common.c | 14 | ||||
| -rw-r--r-- | lib/x509/common.h | 2 |
2 files changed, 2 insertions, 14 deletions
diff --git a/lib/x509/common.c b/lib/x509/common.c index 616228f152..9ff1c0ff4f 100644 --- a/lib/x509/common.c +++ b/lib/x509/common.c @@ -1953,23 +1953,12 @@ int x509_raw_crt_to_raw_pubkey(const gnutls_datum_t * cert, bool _gnutls_check_valid_key_id(gnutls_datum_t *key_id, - gnutls_datum_t *certbin, time_t now) + gnutls_x509_crt_t cert, time_t now) { uint8_t id[MAX_KEY_ID_SIZE]; size_t id_size; - gnutls_x509_crt_t cert; bool result = 0; - if (gnutls_x509_crt_init(&cert) < 0) { - gnutls_assert(); - return 0; - } - - if (gnutls_x509_crt_import(cert, certbin, GNUTLS_X509_FMT_DER) < 0) { - gnutls_assert(); - goto out; - } - if (now > gnutls_x509_crt_get_expiration_time(cert) && now < gnutls_x509_crt_get_activation_time(cert)) { /* don't bother, certificate is not yet activated or expired */ @@ -1986,6 +1975,5 @@ _gnutls_check_valid_key_id(gnutls_datum_t *key_id, result = 1; out: - gnutls_x509_crt_deinit(cert); return result; } diff --git a/lib/x509/common.h b/lib/x509/common.h index bf12fc7c3e..d39a87c24f 100644 --- a/lib/x509/common.h +++ b/lib/x509/common.h @@ -193,7 +193,7 @@ _gnutls_check_if_same_key2(gnutls_x509_crt_t cert1, bool _gnutls_check_valid_key_id(gnutls_datum_t *key_id, - gnutls_datum_t *certbin, time_t now); + gnutls_x509_crt_t cert, time_t now); bool _gnutls_check_if_same_cert(gnutls_x509_crt_t cert1, |