diff options
Diffstat (limited to 'networking/tls.c')
-rw-r--r-- | networking/tls.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/networking/tls.c b/networking/tls.c index db7be07f3..854937302 100644 --- a/networking/tls.c +++ b/networking/tls.c | |||
@@ -446,7 +446,7 @@ static void hmac_begin(hmac_precomputed_t *pre, uint8_t *key, unsigned key_size, | |||
446 | // than INSIZE bytes will first hash the key using H and then use the | 446 | // than INSIZE bytes will first hash the key using H and then use the |
447 | // resultant OUTSIZE byte string as the actual key to HMAC." | 447 | // resultant OUTSIZE byte string as the actual key to HMAC." |
448 | if (key_size > SHA_INSIZE) { | 448 | if (key_size > SHA_INSIZE) { |
449 | bb_error_msg_and_die("HMAC key>64"); //does not happen (yet?) | 449 | bb_simple_error_msg_and_die("HMAC key>64"); //does not happen (yet?) |
450 | // md5sha_ctx_t ctx; | 450 | // md5sha_ctx_t ctx; |
451 | // begin(&ctx); | 451 | // begin(&ctx); |
452 | // md5sha_hash(&ctx, key, key_size); | 452 | // md5sha_hash(&ctx, key, key_size); |
@@ -1132,7 +1132,7 @@ static int tls_xread_record(tls_state_t *tls, const char *expected) | |||
1132 | } | 1132 | } |
1133 | } | 1133 | } |
1134 | if (sz < 0) | 1134 | if (sz < 0) |
1135 | bb_error_msg_and_die("encrypted data too short"); | 1135 | bb_simple_error_msg_and_die("encrypted data too short"); |
1136 | 1136 | ||
1137 | //dump_hex("<< %s\n", tls->inbuf, RECHDR_LEN + sz); | 1137 | //dump_hex("<< %s\n", tls->inbuf, RECHDR_LEN + sz); |
1138 | 1138 | ||
@@ -1411,7 +1411,7 @@ static void find_key_in_der_cert(tls_state_t *tls, uint8_t *der, int len) | |||
1411 | dbg("ECDSA key\n"); | 1411 | dbg("ECDSA key\n"); |
1412 | //UNUSED: tls->flags |= GOT_CERT_ECDSA_KEY_ALG; | 1412 | //UNUSED: tls->flags |= GOT_CERT_ECDSA_KEY_ALG; |
1413 | } else | 1413 | } else |
1414 | bb_error_msg_and_die("not RSA or ECDSA cert"); | 1414 | bb_simple_error_msg_and_die("not RSA or ECDSA cert"); |
1415 | } | 1415 | } |
1416 | 1416 | ||
1417 | if (tls->flags & GOT_CERT_RSA_KEY_ALG) { | 1417 | if (tls->flags & GOT_CERT_RSA_KEY_ALG) { |
@@ -1882,7 +1882,7 @@ static void process_server_key(tls_state_t *tls, int len) | |||
1882 | /* So far we only support curve_x25519 */ | 1882 | /* So far we only support curve_x25519 */ |
1883 | move_from_unaligned32(t32, keybuf); | 1883 | move_from_unaligned32(t32, keybuf); |
1884 | if (t32 != htonl(0x03001d20)) | 1884 | if (t32 != htonl(0x03001d20)) |
1885 | bb_error_msg_and_die("elliptic curve is not x25519"); | 1885 | bb_simple_error_msg_and_die("elliptic curve is not x25519"); |
1886 | 1886 | ||
1887 | memcpy(tls->hsd->ecc_pub_key32, keybuf + 4, 32); | 1887 | memcpy(tls->hsd->ecc_pub_key32, keybuf + 4, 32); |
1888 | tls->flags |= GOT_EC_KEY; | 1888 | tls->flags |= GOT_EC_KEY; |
@@ -1929,7 +1929,7 @@ static void send_client_key_exchange(tls_state_t *tls) | |||
1929 | if (!(tls->flags & NEED_EC_KEY)) { | 1929 | if (!(tls->flags & NEED_EC_KEY)) { |
1930 | /* RSA */ | 1930 | /* RSA */ |
1931 | if (!(tls->flags & GOT_CERT_RSA_KEY_ALG)) | 1931 | if (!(tls->flags & GOT_CERT_RSA_KEY_ALG)) |
1932 | bb_error_msg("server cert is not RSA"); | 1932 | bb_simple_error_msg("server cert is not RSA"); |
1933 | 1933 | ||
1934 | tls_get_random(rsa_premaster, sizeof(rsa_premaster)); | 1934 | tls_get_random(rsa_premaster, sizeof(rsa_premaster)); |
1935 | if (TLS_DEBUG_FIXED_SECRETS) | 1935 | if (TLS_DEBUG_FIXED_SECRETS) |
@@ -1959,7 +1959,7 @@ static void send_client_key_exchange(tls_state_t *tls) | |||
1959 | uint8_t privkey[CURVE25519_KEYSIZE]; //[32] | 1959 | uint8_t privkey[CURVE25519_KEYSIZE]; //[32] |
1960 | 1960 | ||
1961 | if (!(tls->flags & GOT_EC_KEY)) | 1961 | if (!(tls->flags & GOT_EC_KEY)) |
1962 | bb_error_msg("server did not provide EC key"); | 1962 | bb_simple_error_msg("server did not provide EC key"); |
1963 | 1963 | ||
1964 | /* Generate random private key, see RFC 7748 */ | 1964 | /* Generate random private key, see RFC 7748 */ |
1965 | tls_get_random(privkey, sizeof(privkey)); | 1965 | tls_get_random(privkey, sizeof(privkey)); |
@@ -2322,7 +2322,7 @@ void FAST_FUNC tls_run_copy_loop(tls_state_t *tls, unsigned flags) | |||
2322 | int nread; | 2322 | int nread; |
2323 | 2323 | ||
2324 | if (safe_poll(pfds, 2, -1) < 0) | 2324 | if (safe_poll(pfds, 2, -1) < 0) |
2325 | bb_perror_msg_and_die("poll"); | 2325 | bb_simple_perror_msg_and_die("poll"); |
2326 | 2326 | ||
2327 | if (pfds[0].revents) { | 2327 | if (pfds[0].revents) { |
2328 | void *buf; | 2328 | void *buf; |