diff --git a/ssl/loader.c b/ssl/loader.c index 333fb18e9..511eb5313 100644 --- a/ssl/loader.c +++ b/ssl/loader.c @@ -82,7 +82,7 @@ EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type, #ifdef CONFIG_SSL_HAS_PEM ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password); #else - printf(unsupported_str); + printf("%s", unsupported_str); ret = SSL_ERROR_NOT_SUPPORTED; #endif } @@ -93,7 +93,7 @@ error: ssl_obj_free(ssl_obj); return ret; #else - printf(unsupported_str); + printf("%s", unsupported_str); return SSL_ERROR_NOT_SUPPORTED; #endif /* CONFIG_SSL_SKELETON_MODE */ } @@ -150,7 +150,7 @@ static int do_obj(SSL_CTX *ssl_ctx, int obj_type, break; #endif default: - printf(unsupported_str); + printf("%s", unsupported_str); ret = SSL_ERROR_NOT_SUPPORTED; break; } diff --git a/ssl/tls1.c b/ssl/tls1.c index 6122ae9e9..e95d5eb18 100755 --- a/ssl/tls1.c +++ b/ssl/tls1.c @@ -1447,6 +1447,9 @@ int send_change_cipher_spec(SSL *ssl) if (ssl->cipher_info) SET_SSL_FLAG(SSL_TX_ENCRYPTED); + if (ssl->cipher_info) + SET_SSL_FLAG(SSL_TX_ENCRYPTED); + memset(ssl->write_sequence, 0, 8); return ret; } @@ -2161,7 +2164,7 @@ EXP_FUNC void STDCALL ssl_display_error(int error_code) {} EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const uint8_t *session_id, uint8_t sess_id_size) { - printf(unsupported_str); + printf("%s", unsupported_str); return NULL; } #endif @@ -2169,20 +2172,20 @@ EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const #if !defined(CONFIG_SSL_CERT_VERIFICATION) EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl) { - printf(unsupported_str); + printf("%s", unsupported_str); return -1; } EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component) { - printf(unsupported_str); + printf("%s", unsupported_str); return NULL; } EXP_FUNC const char * STDCALL ssl_get_cert_subject_alt_dnsname(const SSL *ssl, int index) { - printf(unsupported_str); + printf("%s", unsupported_str); return NULL; } diff --git a/ssl/tls1_svr.c b/ssl/tls1_svr.c index 51c9d76e8..1a99ac1fa 100644 --- a/ssl/tls1_svr.c +++ b/ssl/tls1_svr.c @@ -117,7 +117,6 @@ int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len) static int process_client_hello(SSL *ssl) { uint8_t *buf = ssl->bm_data; - uint8_t *record_buf = ssl->hmac_header; int pkt_size = ssl->bm_index; int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE; int ret = SSL_OK;