projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the SCT List extension parser into libssl.
[openssl.git]
/
ssl
/
ssl_lib.c
diff --git
a/ssl/ssl_lib.c
b/ssl/ssl_lib.c
index 8f0eb154435fc48dbc86513d4a4bd2e29c564a0d..d47f26865bf58f5f66e3f94c2c16aad7a200c535 100644
(file)
--- a/
ssl/ssl_lib.c
+++ b/
ssl/ssl_lib.c
@@
-2411,20
+2411,20
@@
void ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher)
emask_k|=SSL_kRSA;
#if 0
emask_k|=SSL_kRSA;
#if 0
- /* The match needs to be both k
EDH
and aRSA or aDSA, so don't worry */
+ /* The match needs to be both k
DHE
and aRSA or aDSA, so don't worry */
if ( (dh_tmp || dh_rsa || dh_dsa) &&
(rsa_enc || rsa_sign || dsa_sign))
if ( (dh_tmp || dh_rsa || dh_dsa) &&
(rsa_enc || rsa_sign || dsa_sign))
- mask_k|=SSL_k
EDH
;
+ mask_k|=SSL_k
DHE
;
if ((dh_tmp_export || dh_rsa_export || dh_dsa_export) &&
(rsa_enc || rsa_sign || dsa_sign))
if ((dh_tmp_export || dh_rsa_export || dh_dsa_export) &&
(rsa_enc || rsa_sign || dsa_sign))
- emask_k|=SSL_k
EDH
;
+ emask_k|=SSL_k
DHE
;
#endif
if (dh_tmp_export)
#endif
if (dh_tmp_export)
- emask_k|=SSL_k
EDH
;
+ emask_k|=SSL_k
DHE
;
if (dh_tmp)
if (dh_tmp)
- mask_k|=SSL_k
EDH
;
+ mask_k|=SSL_k
DHE
;
if (dh_rsa) mask_k|=SSL_kDHr;
if (dh_rsa_export) emask_k|=SSL_kDHr;
if (dh_rsa) mask_k|=SSL_kDHr;
if (dh_rsa_export) emask_k|=SSL_kDHr;
@@
-2750,6
+2750,11
@@
void ssl_update_cache(SSL *s,int mode)
}
}
}
}
+const SSL_METHOD *SSL_CTX_get_ssl_method(SSL_CTX *ctx)
+ {
+ return ctx->method;
+ }
+
const SSL_METHOD *SSL_get_ssl_method(SSL *s)
{
return(s->method);
const SSL_METHOD *SSL_get_ssl_method(SSL *s)
{
return(s->method);