2015-12-14
2015-12-14 16:16:06 by Henrik Grubbström (Grubba) <grubba@grubba.org>
-
0c22bf3fd964c611359f8ac465fbf7823782bc92
(7 lines)
(+5/-2)
[
Show
| Annotate
]
Branch: 0c22bf3fd964c611359f8ac465fbf7823782bc92
SSL: More cipher strength fixes.
The get_suites() API differs between Pike 7.8 and 8.0.
The removed symbol preferred_rsa_suites was replaced by a getter, so it
isn't a suitable symbol to use to detect the presence of get_suites().
2310: Inside #if constant(SSL.ServerConnection)
});
}
ctx->preferred_suites = suites;
- #elif !constant(SSL.Constants.preferred_rsa_suites)
+ #elif constant(SSL.Constants.CIPHER_aead)
int bits = query("ssl_key_bits");
- ctx->preferred_suites = ctx->get_suites(bits);
+ // NB: The arguments to get_suites() in Pike 7.8 currently differs
+ // from the ones in Pike 8.0.
+ ctx->preferred_suites = ctx->get_suites(SSL.Constants.SIGNATURE_rsa, bits);
#else
#ifndef ALLOW_WEAK_SSL
// Filter weak and really weak cipher suites.