diff options
author | jsing <> | 2014-05-25 16:23:10 +0000 |
---|---|---|
committer | jsing <> | 2014-05-25 16:23:10 +0000 |
commit | 20aefbf0b86724bbf87cb9ceb36defa64e4691ab (patch) | |
tree | 3f1db49f0679d8ac712ededb86f1b538423eea91 /src/lib/libssl/ssl_lib.c | |
parent | 23deca1ca2f60559c720fd71c5ac72fb2c862771 (diff) | |
download | openbsd-20aefbf0b86724bbf87cb9ceb36defa64e4691ab.tar.gz openbsd-20aefbf0b86724bbf87cb9ceb36defa64e4691ab.tar.bz2 openbsd-20aefbf0b86724bbf87cb9ceb36defa64e4691ab.zip |
Remove TLS_DEBUG, SSL_DEBUG, CIPHER_DEBUG and OPENSSL_RI_DEBUG. Much of
this is sporadic, hacked up and can easily be put back in an improved form
should we ever need it.
ok miod@
Diffstat (limited to 'src/lib/libssl/ssl_lib.c')
-rw-r--r-- | src/lib/libssl/ssl_lib.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c index 694bc900a0..deef714be1 100644 --- a/src/lib/libssl/ssl_lib.c +++ b/src/lib/libssl/ssl_lib.c | |||
@@ -1442,9 +1442,6 @@ ssl_cipher_list_to_bytes(SSL *s, STACK_OF(SSL_CIPHER) *sk, unsigned char *p, | |||
1442 | j = put_cb ? put_cb(&scsv, p) : | 1442 | j = put_cb ? put_cb(&scsv, p) : |
1443 | ssl_put_cipher_by_char(s, &scsv, p); | 1443 | ssl_put_cipher_by_char(s, &scsv, p); |
1444 | p += j; | 1444 | p += j; |
1445 | #ifdef OPENSSL_RI_DEBUG | ||
1446 | fprintf(stderr, "SCSV sent by client\n"); | ||
1447 | #endif | ||
1448 | } | 1445 | } |
1449 | 1446 | ||
1450 | return (p - q); | 1447 | return (p - q); |
@@ -1490,9 +1487,6 @@ ssl_bytes_to_cipher_list(SSL *s, unsigned char *p, int num, | |||
1490 | } | 1487 | } |
1491 | s->s3->send_connection_binding = 1; | 1488 | s->s3->send_connection_binding = 1; |
1492 | p += n; | 1489 | p += n; |
1493 | #ifdef OPENSSL_RI_DEBUG | ||
1494 | fprintf(stderr, "SCSV received by server\n"); | ||
1495 | #endif | ||
1496 | continue; | 1490 | continue; |
1497 | } | 1491 | } |
1498 | 1492 | ||
@@ -2066,12 +2060,6 @@ ssl_set_cert_masks(CERT *c, const SSL_CIPHER *cipher) | |||
2066 | 2060 | ||
2067 | 2061 | ||
2068 | 2062 | ||
2069 | #ifdef CIPHER_DEBUG | ||
2070 | printf("rt=%d rte=%d dht=%d ecdht=%d re=%d ree=%d " | ||
2071 | "rs=%d ds=%d dhr=%d dhd=%d\n", | ||
2072 | rsa_tmp, rsa_tmp_export, dh_tmp, have_ecdh_tmp, | ||
2073 | rsa_enc, rsa_enc_export, rsa_sign, dsa_sign, dh_rsa, dh_dsa); | ||
2074 | #endif | ||
2075 | 2063 | ||
2076 | cpk = &(c->pkeys[SSL_PKEY_GOST01]); | 2064 | cpk = &(c->pkeys[SSL_PKEY_GOST01]); |
2077 | if (cpk->x509 != NULL && cpk->privatekey !=NULL) { | 2065 | if (cpk->x509 != NULL && cpk->privatekey !=NULL) { |