Blame openldap-nss-default-cipher-suite-always-selected.patch
|
Jan Vcelak |
397ce0c |
MozNSS: default cipher suite always selected
|
|
Jan Vcelak |
397ce0c |
|
|
Jan Vcelak |
397ce0c |
Author: Tim Strobell <tim.strobell.ctr@nrl.navy.mil>
|
|
Jan Vcelak |
397ce0c |
Upstream ITS: #7285
|
|
Jan Vcelak |
397ce0c |
Upstream commit: 2c2bb2e7aee1b2167f383a8344985a1cf66aff3f
|
|
Jan Vcelak |
397ce0c |
Resolves: #828790
|
|
Jan Vcelak |
397ce0c |
|
|
Jan Vcelak |
397ce0c |
diff --git a/libraries/libldap/tls_m.c b/libraries/libldap/tls_m.c
|
|
Jan Vcelak |
397ce0c |
index 23d843c..b608551 100644
|
|
Jan Vcelak |
397ce0c |
--- a/libraries/libldap/tls_m.c
|
|
Jan Vcelak |
397ce0c |
+++ b/libraries/libldap/tls_m.c
|
|
Jan Vcelak |
397ce0c |
@@ -2218,12 +2218,13 @@ tlsm_deferred_ctx_init( void *arg )
|
|
Jan Vcelak |
397ce0c |
return -1;
|
|
Jan Vcelak |
397ce0c |
}
|
|
Jan Vcelak |
397ce0c |
|
|
Jan Vcelak |
397ce0c |
- if ( lt->lt_ciphersuite &&
|
|
Jan Vcelak |
397ce0c |
- tlsm_parse_ciphers( ctx, lt->lt_ciphersuite )) {
|
|
Jan Vcelak |
397ce0c |
- Debug( LDAP_DEBUG_ANY,
|
|
Jan Vcelak |
397ce0c |
- "TLS: could not set cipher list %s.\n",
|
|
Jan Vcelak |
397ce0c |
- lt->lt_ciphersuite, 0, 0 );
|
|
Jan Vcelak |
397ce0c |
- return -1;
|
|
Jan Vcelak |
397ce0c |
+ if ( lt->lt_ciphersuite ) {
|
|
Jan Vcelak |
397ce0c |
+ if ( tlsm_parse_ciphers( ctx, lt->lt_ciphersuite ) ) {
|
|
Jan Vcelak |
397ce0c |
+ Debug( LDAP_DEBUG_ANY,
|
|
Jan Vcelak |
397ce0c |
+ "TLS: could not set cipher list %s.\n",
|
|
Jan Vcelak |
397ce0c |
+ lt->lt_ciphersuite, 0, 0 );
|
|
Jan Vcelak |
397ce0c |
+ return -1;
|
|
Jan Vcelak |
397ce0c |
+ }
|
|
Jan Vcelak |
397ce0c |
} else if ( tlsm_parse_ciphers( ctx, "DEFAULT" ) ) {
|
|
Jan Vcelak |
397ce0c |
Debug( LDAP_DEBUG_ANY,
|
|
Jan Vcelak |
397ce0c |
"TLS: could not set cipher list DEFAULT.\n",
|
|
Jan Vcelak |
397ce0c |
--
|
|
Jan Vcelak |
397ce0c |
1.7.10.4
|
|
Jan Vcelak |
397ce0c |
|