summaryrefslogtreecommitdiff
path: root/libextra
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2004-06-29 08:52:47 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2004-06-29 08:52:47 +0000
commit439198a3692a04e70ef224f6a76a357287e2c72e (patch)
tree7f3bf5c3bee43389f6b7d145521f83e0d3792cb5 /libextra
parentcdc05e0aebbbe264767d0fae4062365669fde861 (diff)
downloadgnutls-439198a3692a04e70ef224f6a76a357287e2c72e.tar.gz
The ephemeral DH and RSA parameters are no longer stored in the
session resume DB. This saves space, but will cause resumed sessions not to be able to access the original session parameters (which is ok).
Diffstat (limited to 'libextra')
-rw-r--r--libextra/gnutls_openpgp.c6
-rw-r--r--libextra/openpgp/verify.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index 71430a4db6..b8355adf3f 100644
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -259,11 +259,11 @@ openpgp_pk_to_gnutls_cert(gnutls_cert * cert, cdk_pkt_pubkey_t pk)
cert->cert_type = GNUTLS_CRT_OPENPGP;
if (is_DSA(pk->pubkey_algo) || pk->pubkey_algo == GCRY_PK_RSA_S)
- cert->keyUsage = KEY_DIGITAL_SIGNATURE;
+ cert->key_usage = KEY_DIGITAL_SIGNATURE;
else if (pk->pubkey_algo == GCRY_PK_RSA_E)
- cert->keyUsage = KEY_KEY_ENCIPHERMENT;
+ cert->key_usage = KEY_KEY_ENCIPHERMENT;
else if (pk->pubkey_algo == GCRY_PK_RSA)
- cert->keyUsage = KEY_DIGITAL_SIGNATURE | KEY_KEY_ENCIPHERMENT;
+ cert->key_usage = KEY_DIGITAL_SIGNATURE | KEY_KEY_ENCIPHERMENT;
cert->params_size = cdk_pk_get_npkey(pk->pubkey_algo);
for (i = 0; i < cert->params_size; i++) {
diff --git a/libextra/openpgp/verify.c b/libextra/openpgp/verify.c
index 47afb61770..b06eea419e 100644
--- a/libextra/openpgp/verify.c
+++ b/libextra/openpgp/verify.c
@@ -29,6 +29,7 @@
#include <gnutls_openpgp.h>
#include <gnutls_num.h>
#include <openpgp.h>
+#include <x509/verify.h> /* lib/x509/verify.h */
static int
openpgp_get_key_trust(gnutls_openpgp_trustdb_t trustdb,