arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-09 03:41:41 +03:00
Code

added printf changes from Fabian Frank to stop warnings/erros

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@231 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich 2013-09-22 10:34:51 +00:00
parent 5c51893035
commit 97f9f969a3
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/loader.c
View File

@ -82,7 +82,7 @@ EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type,
#ifdef CONFIG_SSL_HAS_PEM #ifdef CONFIG_SSL_HAS_PEM
ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password); ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password);
#else #else
printf(unsupported_str); printf("%s", unsupported_str);
ret = SSL_ERROR_NOT_SUPPORTED; ret = SSL_ERROR_NOT_SUPPORTED;
#endif #endif
} }
@ -93,7 +93,7 @@ error:
ssl_obj_free(ssl_obj); ssl_obj_free(ssl_obj);
return ret; return ret;
#else #else
printf(unsupported_str); printf("%s", unsupported_str);
return SSL_ERROR_NOT_SUPPORTED; return SSL_ERROR_NOT_SUPPORTED;
#endif /* CONFIG_SSL_SKELETON_MODE */ #endif /* CONFIG_SSL_SKELETON_MODE */
} }
@ -150,7 +150,7 @@ static int do_obj(SSL_CTX *ssl_ctx, int obj_type,
break; break;
#endif #endif
default: default:
printf(unsupported_str); printf("%s", unsupported_str);
ret = SSL_ERROR_NOT_SUPPORTED; ret = SSL_ERROR_NOT_SUPPORTED;
break; break;
} }

11
ssl/tls1.c
View File

@ -1447,6 +1447,9 @@ int send_change_cipher_spec(SSL *ssl)
if (ssl->cipher_info) if (ssl->cipher_info)
SET_SSL_FLAG(SSL_TX_ENCRYPTED); SET_SSL_FLAG(SSL_TX_ENCRYPTED);
if (ssl->cipher_info)
SET_SSL_FLAG(SSL_TX_ENCRYPTED);
memset(ssl->write_sequence, 0, 8); memset(ssl->write_sequence, 0, 8);
return ret; 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 EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
uint8_t *session_id, uint8_t sess_id_size) uint8_t *session_id, uint8_t sess_id_size)
{ {
printf(unsupported_str); printf("%s", unsupported_str);
return NULL; return NULL;
} }
#endif #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) #if !defined(CONFIG_SSL_CERT_VERIFICATION)
EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl) EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl)
{ {
printf(unsupported_str); printf("%s", unsupported_str);
return -1; return -1;
} }
EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component) EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component)
{ {
printf(unsupported_str); printf("%s", unsupported_str);
return NULL; return NULL;
} }
EXP_FUNC const char * STDCALL ssl_get_cert_subject_alt_dnsname(const SSL *ssl, int index) 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; return NULL;
} }

1
ssl/tls1_svr.c
View File

@ -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) static int process_client_hello(SSL *ssl)
{ {
uint8_t *buf = ssl->bm_data; uint8_t *buf = ssl->bm_data;
uint8_t *record_buf = ssl->hmac_header;
int pkt_size = ssl->bm_index; int pkt_size = ssl->bm_index;
int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE; int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE;
int ret = SSL_OK; int ret = SSL_OK;