summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_ciph.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/libssl/ssl_ciph.c')
-rw-r--r--src/lib/libssl/ssl_ciph.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index a1523524a1..77d8a3c79f 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -792,9 +792,6 @@ CIPHER_ORDER **head_p, CIPHER_ORDER **tail_p)
792 co_list[co_list_num].prev = NULL; 792 co_list[co_list_num].prev = NULL;
793 co_list[co_list_num].active = 0; 793 co_list[co_list_num].active = 0;
794 co_list_num++; 794 co_list_num++;
795#ifdef KSSL_DEBUG
796 printf("\t%d: %s %lx %lx %lx\n", i, c->name, c->id, c->algorithm_mkey, c->algorithm_auth);
797#endif /* KSSL_DEBUG */
798 /* 795 /*
799 if (!sk_push(ca_list,(char *)c)) goto err; 796 if (!sk_push(ca_list,(char *)c)) goto err;
800 */ 797 */
@@ -1321,9 +1318,6 @@ ssl_create_cipher_list(const SSL_METHOD *ssl_method,
1321 * it is used for allocation. 1318 * it is used for allocation.
1322 */ 1319 */
1323 num_of_ciphers = ssl_method->num_ciphers(); 1320 num_of_ciphers = ssl_method->num_ciphers();
1324#ifdef KSSL_DEBUG
1325 printf("ssl_create_cipher_list() for %d ciphers\n", num_of_ciphers);
1326#endif /* KSSL_DEBUG */
1327 co_list = reallocarray(NULL, num_of_ciphers, sizeof(CIPHER_ORDER)); 1321 co_list = reallocarray(NULL, num_of_ciphers, sizeof(CIPHER_ORDER));
1328 if (co_list == NULL) { 1322 if (co_list == NULL) {
1329 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE); 1323 SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST, ERR_R_MALLOC_FAILURE);
@@ -1468,11 +1462,7 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1468 const char *ver, *exp_str; 1462 const char *ver, *exp_str;
1469 const char *kx, *au, *enc, *mac; 1463 const char *kx, *au, *enc, *mac;
1470 unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, alg2; 1464 unsigned long alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl, alg2;
1471#ifdef KSSL_DEBUG
1472 static const char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s AL=%lx/%lx/%lx/%lx/%lx\n";
1473#else
1474 static const char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s\n"; 1465 static const char *format="%-23s %s Kx=%-8s Au=%-4s Enc=%-9s Mac=%-4s%s\n";
1475#endif /* KSSL_DEBUG */
1476 1466
1477 alg_mkey = cipher->algorithm_mkey; 1467 alg_mkey = cipher->algorithm_mkey;
1478 alg_auth = cipher->algorithm_auth; 1468 alg_auth = cipher->algorithm_auth;
@@ -1636,11 +1626,7 @@ SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
1636 } else if (len < 128) 1626 } else if (len < 128)
1637 return("Buffer too small"); 1627 return("Buffer too small");
1638 1628
1639#ifdef KSSL_DEBUG
1640 l = snprintf(buf, len, format, cipher->name, ver, kx, au, enc, mac, exp_str, alg_mkey, alg_auth, alg_enc, alg_mac, alg_ssl);
1641#else
1642 l = snprintf(buf, len, format, cipher->name, ver, kx, au, enc, mac, exp_str); 1629 l = snprintf(buf, len, format, cipher->name, ver, kx, au, enc, mac, exp_str);
1643#endif /* KSSL_DEBUG */
1644 if (l >= len || l == -1) 1630 if (l >= len || l == -1)
1645 return("Buffer too small"); 1631 return("Buffer too small");
1646 else 1632 else