diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-06-29 08:52:47 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2004-06-29 08:52:47 +0000 |
| commit | 439198a3692a04e70ef224f6a76a357287e2c72e (patch) | |
| tree | 7f3bf5c3bee43389f6b7d145521f83e0d3792cb5 /lib/gnutls_x509.c | |
| parent | cdc05e0aebbbe264767d0fae4062365669fde861 (diff) | |
| download | gnutls-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 'lib/gnutls_x509.c')
| -rw-r--r-- | lib/gnutls_x509.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c index 4c4dd71a2d..6f2b549f5c 100644 --- a/lib/gnutls_x509.c +++ b/lib/gnutls_x509.c @@ -1036,7 +1036,7 @@ static int generate_rdn_seq(gnutls_certificate_credentials_t res) int _gnutls_check_key_usage(const gnutls_cert * cert, gnutls_kx_algorithm_t alg) { - unsigned int keyUsage = 0; + unsigned int key_usage = 0; int encipher_type; if (cert == NULL) { @@ -1047,12 +1047,12 @@ int _gnutls_check_key_usage(const gnutls_cert * cert, if (_gnutls_map_kx_get_cred(alg, 1) == GNUTLS_CRD_CERTIFICATE || _gnutls_map_kx_get_cred(alg, 0) == GNUTLS_CRD_CERTIFICATE) { - keyUsage = cert->keyUsage; + key_usage = cert->key_usage; encipher_type = _gnutls_kx_encipher_type(alg); - if (keyUsage != 0 && encipher_type != CIPHER_IGN) { - /* If keyUsage has been set in the certificate + if (key_usage != 0 && encipher_type != CIPHER_IGN) { + /* If key_usage has been set in the certificate */ if (encipher_type == CIPHER_ENCRYPT) { @@ -1060,7 +1060,7 @@ int _gnutls_check_key_usage(const gnutls_cert * cert, * type algorithm, and key's usage does not permit * encipherment, then fail. */ - if (!(keyUsage & KEY_KEY_ENCIPHERMENT)) { + if (!(key_usage & KEY_KEY_ENCIPHERMENT)) { gnutls_assert(); return GNUTLS_E_KEY_USAGE_VIOLATION; } @@ -1069,7 +1069,7 @@ int _gnutls_check_key_usage(const gnutls_cert * cert, if (encipher_type == CIPHER_SIGN) { /* The same as above, but for sign only keys */ - if (!(keyUsage & KEY_DIGITAL_SIGNATURE)) { + if (!(key_usage & KEY_DIGITAL_SIGNATURE)) { gnutls_assert(); return GNUTLS_E_KEY_USAGE_VIOLATION; } |