diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/s3_lib.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c index 1a0bb5195d..8b67e7c36a 100644 --- a/src/lib/libssl/s3_lib.c +++ b/src/lib/libssl/s3_lib.c | |||
| @@ -3048,20 +3048,6 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, | |||
| 3048 | sk_SSL_CIPHER_set_cmp_func(clnt, ssl_cipher_ptr_id_cmp); | 3048 | sk_SSL_CIPHER_set_cmp_func(clnt, ssl_cipher_ptr_id_cmp); |
| 3049 | #endif | 3049 | #endif |
| 3050 | 3050 | ||
| 3051 | #ifdef CIPHER_DEBUG | ||
| 3052 | printf("Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr), | ||
| 3053 | (void *)srvr); | ||
| 3054 | for (i = 0; i < sk_SSL_CIPHER_num(srvr); ++i) { | ||
| 3055 | c = sk_SSL_CIPHER_value(srvr, i); | ||
| 3056 | printf("%p:%s\n",(void *)c, c->name); | ||
| 3057 | } | ||
| 3058 | printf("Client sent %d from %p:\n", sk_SSL_CIPHER_num(clnt), | ||
| 3059 | (void *)clnt); | ||
| 3060 | for (i = 0; i < sk_SSL_CIPHER_num(clnt); ++i) { | ||
| 3061 | c = sk_SSL_CIPHER_value(clnt, i); | ||
| 3062 | printf("%p:%s\n",(void *)c, c->name); | ||
| 3063 | } | ||
| 3064 | #endif | ||
| 3065 | 3051 | ||
| 3066 | if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) { | 3052 | if (s->options & SSL_OP_CIPHER_SERVER_PREFERENCE) { |
| 3067 | prio = srvr; | 3053 | prio = srvr; |
| @@ -3097,18 +3083,8 @@ SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt, | |||
| 3097 | 3083 | ||
| 3098 | if (SSL_C_IS_EXPORT(c)) { | 3084 | if (SSL_C_IS_EXPORT(c)) { |
| 3099 | ok = (alg_k & emask_k) && (alg_a & emask_a); | 3085 | ok = (alg_k & emask_k) && (alg_a & emask_a); |
| 3100 | #ifdef CIPHER_DEBUG | ||
| 3101 | printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s (export)\n", | ||
| 3102 | ok, alg_k, alg_a, emask_k, emask_a, (void *)c, | ||
| 3103 | c->name); | ||
| 3104 | #endif | ||
| 3105 | } else { | 3086 | } else { |
| 3106 | ok = (alg_k & mask_k) && (alg_a & mask_a); | 3087 | ok = (alg_k & mask_k) && (alg_a & mask_a); |
| 3107 | #ifdef CIPHER_DEBUG | ||
| 3108 | printf("%d:[%08lX:%08lX:%08lX:%08lX]%p:%s\n", | ||
| 3109 | ok, alg_k, alg_a, mask_k, mask_a,(void *)c, | ||
| 3110 | c->name); | ||
| 3111 | #endif | ||
| 3112 | } | 3088 | } |
| 3113 | 3089 | ||
| 3114 | #ifndef OPENSSL_NO_TLSEXT | 3090 | #ifndef OPENSSL_NO_TLSEXT |
