diff options
-rw-r--r-- | networking/tls.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/networking/tls.c b/networking/tls.c index e64e84fcd..66d62fe3d 100644 --- a/networking/tls.c +++ b/networking/tls.c | |||
@@ -52,7 +52,7 @@ | |||
52 | // (TLS_RSA_WITH_AES_128_CBC_SHA - in TLS 1.2 it's mandated to be always supported) | 52 | // (TLS_RSA_WITH_AES_128_CBC_SHA - in TLS 1.2 it's mandated to be always supported) |
53 | #define CIPHER_ID1 TLS_RSA_WITH_AES_256_CBC_SHA256 //0x003D | 53 | #define CIPHER_ID1 TLS_RSA_WITH_AES_256_CBC_SHA256 //0x003D |
54 | // Works with "wget https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.5.tar.xz" | 54 | // Works with "wget https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.9.5.tar.xz" |
55 | #define CIPHER_ID2 TLS_RSA_WITH_AES_128_CBC_SHA //0x003C | 55 | #define CIPHER_ID2 TLS_RSA_WITH_AES_128_CBC_SHA //0x002F |
56 | 56 | ||
57 | // bug #11456: | 57 | // bug #11456: |
58 | // ftp.openbsd.org only supports ECDHE-RSA-AESnnn-GCM-SHAnnn or ECDHE-RSA-CHACHA20-POLY1305 | 58 | // ftp.openbsd.org only supports ECDHE-RSA-AESnnn-GCM-SHAnnn or ECDHE-RSA-CHACHA20-POLY1305 |
@@ -62,6 +62,8 @@ | |||
62 | 62 | ||
63 | #define NUM_CIPHERS 4 | 63 | #define NUM_CIPHERS 4 |
64 | //TODO: we can support all these: | 64 | //TODO: we can support all these: |
65 | // TLS_RSA_WITH_AES_128_CBC_SHA 0x002F | ||
66 | // TLS_RSA_WITH_AES_256_CBC_SHA 0x0035 | ||
65 | // TLS_RSA_WITH_AES_128_CBC_SHA256 0x003C | 67 | // TLS_RSA_WITH_AES_128_CBC_SHA256 0x003C |
66 | // TLS_RSA_WITH_AES_256_CBC_SHA256 0x003D | 68 | // TLS_RSA_WITH_AES_256_CBC_SHA256 0x003D |
67 | // TLS_RSA_WITH_AES_128_GCM_SHA256 0x009C | 69 | // TLS_RSA_WITH_AES_128_GCM_SHA256 0x009C |
@@ -324,11 +326,13 @@ static unsigned get24be(const uint8_t *p) | |||
324 | 326 | ||
325 | #if TLS_DEBUG | 327 | #if TLS_DEBUG |
326 | /* Nondestructively see the current hash value */ | 328 | /* Nondestructively see the current hash value */ |
329 | # if TLS_DEBUG_HASH | ||
327 | static unsigned sha_peek(md5sha_ctx_t *ctx, void *buffer) | 330 | static unsigned sha_peek(md5sha_ctx_t *ctx, void *buffer) |
328 | { | 331 | { |
329 | md5sha_ctx_t ctx_copy = *ctx; /* struct copy */ | 332 | md5sha_ctx_t ctx_copy = *ctx; /* struct copy */ |
330 | return sha_end(&ctx_copy, buffer); | 333 | return sha_end(&ctx_copy, buffer); |
331 | } | 334 | } |
335 | # endif | ||
332 | 336 | ||
333 | static void dump_hex(const char *fmt, const void *vp, int len) | 337 | static void dump_hex(const char *fmt, const void *vp, int len) |
334 | { | 338 | { |