diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_lib.c | 14 | 
1 files changed, 7 insertions, 7 deletions
| diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index bc8b56d3be..8ca2c8d783 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_lib.c,v 1.163 2017/08/10 17:18:38 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_lib.c,v 1.164 2017/08/11 21:06:17 jsing Exp $ */ | 
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 
| 3 | * All rights reserved. | 3 | * All rights reserved. | 
| 4 | * | 4 | * | 
| @@ -2072,18 +2072,18 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
| 2072 | } | 2072 | } | 
| 2073 | 2073 | ||
| 2074 | if (rsa_enc) | 2074 | if (rsa_enc) | 
| 2075 | mask_k|=SSL_kRSA; | 2075 | mask_k |= SSL_kRSA; | 
| 2076 | 2076 | ||
| 2077 | if (dh_tmp) | 2077 | if (dh_tmp) | 
| 2078 | mask_k|=SSL_kDHE; | 2078 | mask_k |= SSL_kDHE; | 
| 2079 | 2079 | ||
| 2080 | if (rsa_enc || rsa_sign) | 2080 | if (rsa_enc || rsa_sign) | 
| 2081 | mask_a|=SSL_aRSA; | 2081 | mask_a |= SSL_aRSA; | 
| 2082 | 2082 | ||
| 2083 | if (dsa_sign) | 2083 | if (dsa_sign) | 
| 2084 | mask_a|=SSL_aDSS; | 2084 | mask_a |= SSL_aDSS; | 
| 2085 | 2085 | ||
| 2086 | mask_a|=SSL_aNULL; | 2086 | mask_a |= SSL_aNULL; | 
| 2087 | 2087 | ||
| 2088 | /* | 2088 | /* | 
| 2089 | * An ECC certificate may be usable for ECDH and/or | 2089 | * An ECC certificate may be usable for ECDH and/or | 
| @@ -2098,7 +2098,7 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
| 2098 | /* Key usage, if present, must allow signing. */ | 2098 | /* Key usage, if present, must allow signing. */ | 
| 2099 | if ((x->ex_flags & EXFLAG_KUSAGE) == 0 || | 2099 | if ((x->ex_flags & EXFLAG_KUSAGE) == 0 || | 
| 2100 | (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE)) | 2100 | (x->ex_kusage & X509v3_KU_DIGITAL_SIGNATURE)) | 
| 2101 | mask_a|=SSL_aECDSA; | 2101 | mask_a |= SSL_aECDSA; | 
| 2102 | } | 2102 | } | 
| 2103 | 2103 | ||
| 2104 | mask_k |= SSL_kECDHE; | 2104 | mask_k |= SSL_kECDHE; | 
