mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-01 05:55:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

allow key agreement for SSL/TLS certificates

Browse Source
This commit is contained in:
Dr. Stephen Henson 2012-01-26 14:57:45 +00:00
parent 08e4ea4884
commit 7568d15acd
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/x509v3/v3_purp.c
View File

@ -562,12 +562,18 @@ static int check_purpose_ssl_client(const X509_PURPOSE *xp, const X509 *x, int c
{ {
if(xku_reject(x,XKU_SSL_CLIENT)) return 0; if(xku_reject(x,XKU_SSL_CLIENT)) return 0;
if(ca) return check_ssl_ca(x); if(ca) return check_ssl_ca(x);
/* We need to do digital signatures with it */ /* We need to do digital signatures or key agreement */
if(ku_reject(x,KU_DIGITAL_SIGNATURE)) return 0; if(ku_reject(x,KU_DIGITAL_SIGNATURE|KU_KEY_AGREEMENT)) return 0;
/* nsCertType if present should allow SSL client use */ /* nsCertType if present should allow SSL client use */
if(ns_reject(x, NS_SSL_CLIENT)) return 0; if(ns_reject(x, NS_SSL_CLIENT)) return 0;
return 1; return 1;
} }
/* Key usage needed for TLS/SSL server: digital signature, encipherment or
* key agreement. The ssl code can check this more thoroughly for individual
* key types.
*/
#define KU_TLS \
KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT|KU_KEY_AGREEMENT
static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca) static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int ca)
{ {
@ -575,8 +581,7 @@ static int check_purpose_ssl_server(const X509_PURPOSE *xp, const X509 *x, int c
if(ca) return check_ssl_ca(x); if(ca) return check_ssl_ca(x);
if(ns_reject(x, NS_SSL_SERVER)) return 0; if(ns_reject(x, NS_SSL_SERVER)) return 0;
/* Now as for keyUsage: we'll at least need to sign OR encipher */ if(ku_reject(x, KU_TLS)) return 0;
if(ku_reject(x, KU_DIGITAL_SIGNATURE|KU_KEY_ENCIPHERMENT)) return 0;
return 1; return 1;