diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index fa70f21f95..5ad69f5ce9 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -998,9 +998,6 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
998 | 998 | ||
999 | if (data + size > (d + n)) | 999 | if (data + size > (d + n)) |
1000 | goto ri_check; | 1000 | goto ri_check; |
1001 | #if 0 | ||
1002 | fprintf(stderr, "Received extension type %d size %d\n", type, size); | ||
1003 | #endif | ||
1004 | if (s->tlsext_debug_cb) | 1001 | if (s->tlsext_debug_cb) |
1005 | s->tlsext_debug_cb(s, 0, type, data, size, | 1002 | s->tlsext_debug_cb(s, 0, type, data, size, |
1006 | s->tlsext_debug_arg); | 1003 | s->tlsext_debug_arg); |
@@ -1124,13 +1121,6 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
1124 | s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length; | 1121 | s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length; |
1125 | memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length); | 1122 | memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length); |
1126 | } | 1123 | } |
1127 | #if 0 | ||
1128 | fprintf(stderr, "ssl_parse_clienthello_tlsext s->session->tlsext_ecpointformatlist (length=%i) ", s->session->tlsext_ecpointformatlist_length); | ||
1129 | sdata = s->session->tlsext_ecpointformatlist; | ||
1130 | for (i = 0; i < s->session->tlsext_ecpointformatlist_length; i++) | ||
1131 | fprintf(stderr, "%i ", *(sdata++)); | ||
1132 | fprintf(stderr, "\n"); | ||
1133 | #endif | ||
1134 | } else if (type == TLSEXT_TYPE_elliptic_curves && | 1124 | } else if (type == TLSEXT_TYPE_elliptic_curves && |
1135 | s->version != DTLS1_VERSION) { | 1125 | s->version != DTLS1_VERSION) { |
1136 | unsigned char *sdata = data; | 1126 | unsigned char *sdata = data; |
@@ -1156,13 +1146,6 @@ ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
1156 | s->session->tlsext_ellipticcurvelist_length = ellipticcurvelist_length; | 1146 | s->session->tlsext_ellipticcurvelist_length = ellipticcurvelist_length; |
1157 | memcpy(s->session->tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length); | 1147 | memcpy(s->session->tlsext_ellipticcurvelist, sdata, ellipticcurvelist_length); |
1158 | } | 1148 | } |
1159 | #if 0 | ||
1160 | fprintf(stderr, "ssl_parse_clienthello_tlsext s->session->tlsext_ellipticcurvelist (length=%i) ", s->session->tlsext_ellipticcurvelist_length); | ||
1161 | sdata = s->session->tlsext_ellipticcurvelist; | ||
1162 | for (i = 0; i < s->session->tlsext_ellipticcurvelist_length; i++) | ||
1163 | fprintf(stderr, "%i ", *(sdata++)); | ||
1164 | fprintf(stderr, "\n"); | ||
1165 | #endif | ||
1166 | } | 1149 | } |
1167 | #endif /* OPENSSL_NO_EC */ | 1150 | #endif /* OPENSSL_NO_EC */ |
1168 | #ifdef TLSEXT_TYPE_opaque_prf_input | 1151 | #ifdef TLSEXT_TYPE_opaque_prf_input |
@@ -1451,13 +1434,6 @@ ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, | |||
1451 | } | 1434 | } |
1452 | s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length; | 1435 | s->session->tlsext_ecpointformatlist_length = ecpointformatlist_length; |
1453 | memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length); | 1436 | memcpy(s->session->tlsext_ecpointformatlist, sdata, ecpointformatlist_length); |
1454 | #if 0 | ||
1455 | fprintf(stderr, "ssl_parse_serverhello_tlsext s->session->tlsext_ecpointformatlist "); | ||
1456 | sdata = s->session->tlsext_ecpointformatlist; | ||
1457 | for (i = 0; i < s->session->tlsext_ecpointformatlist_length; i++) | ||
1458 | fprintf(stderr, "%i ", *(sdata++)); | ||
1459 | fprintf(stderr, "\n"); | ||
1460 | #endif | ||
1461 | } | 1437 | } |
1462 | #endif /* OPENSSL_NO_EC */ | 1438 | #endif /* OPENSSL_NO_EC */ |
1463 | else if (type == TLSEXT_TYPE_session_ticket) { | 1439 | else if (type == TLSEXT_TYPE_session_ticket) { |
@@ -2230,18 +2206,6 @@ tls12_find_id(int nid, tls12_lookup *table, size_t tlen) | |||
2230 | } | 2206 | } |
2231 | return -1; | 2207 | return -1; |
2232 | } | 2208 | } |
2233 | #if 0 | ||
2234 | static int | ||
2235 | tls12_find_nid(int id, tls12_lookup *table, size_t tlen) | ||
2236 | { | ||
2237 | size_t i; | ||
2238 | for (i = 0; i < tlen; i++) { | ||
2239 | if (table[i].id == id) | ||
2240 | return table[i].nid; | ||
2241 | } | ||
2242 | return -1; | ||
2243 | } | ||
2244 | #endif | ||
2245 | 2209 | ||
2246 | int | 2210 | int |
2247 | tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, const EVP_MD *md) | 2211 | tls12_get_sigandhash(unsigned char *p, const EVP_PKEY *pk, const EVP_MD *md) |