Skip to content

Commit 97f9f96

Browse files
author
cameronrich
committed
added printf changes from Fabian Frank to stop warnings/erros
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@231 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
1 parent 5c51893 commit 97f9f96

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

ssl/loader.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type,
8282
#ifdef CONFIG_SSL_HAS_PEM
8383
ret = ssl_obj_PEM_load(ssl_ctx, obj_type, ssl_obj, password);
8484
#else
85-
printf(unsupported_str);
85+
printf("%s", unsupported_str);
8686
ret = SSL_ERROR_NOT_SUPPORTED;
8787
#endif
8888
}
@@ -93,7 +93,7 @@ EXP_FUNC int STDCALL ssl_obj_load(SSL_CTX *ssl_ctx, int obj_type,
9393
ssl_obj_free(ssl_obj);
9494
return ret;
9595
#else
96-
printf(unsupported_str);
96+
printf("%s", unsupported_str);
9797
return SSL_ERROR_NOT_SUPPORTED;
9898
#endif /* CONFIG_SSL_SKELETON_MODE */
9999
}
@@ -150,7 +150,7 @@ static int do_obj(SSL_CTX *ssl_ctx, int obj_type,
150150
break;
151151
#endif
152152
default:
153-
printf(unsupported_str);
153+
printf("%s", unsupported_str);
154154
ret = SSL_ERROR_NOT_SUPPORTED;
155155
break;
156156
}

ssl/tls1.c

+7-4
Original file line numberDiff line numberDiff line change
@@ -1447,6 +1447,9 @@ int send_change_cipher_spec(SSL *ssl)
14471447

14481448
if (ssl->cipher_info)
14491449
SET_SSL_FLAG(SSL_TX_ENCRYPTED);
1450+
if (ssl->cipher_info)
1451+
SET_SSL_FLAG(SSL_TX_ENCRYPTED);
1452+
14501453
memset(ssl->write_sequence, 0, 8);
14511454
return ret;
14521455
}
@@ -2161,28 +2164,28 @@ EXP_FUNC void STDCALL ssl_display_error(int error_code) {}
21612164
EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
21622165
uint8_t *session_id, uint8_t sess_id_size)
21632166
{
2164-
printf(unsupported_str);
2167+
printf("%s", unsupported_str);
21652168
return NULL;
21662169
}
21672170
#endif
21682171

21692172
#if !defined(CONFIG_SSL_CERT_VERIFICATION)
21702173
EXP_FUNC int STDCALL ssl_verify_cert(const SSL *ssl)
21712174
{
2172-
printf(unsupported_str);
2175+
printf("%s", unsupported_str);
21732176
return -1;
21742177
}
21752178

21762179

21772180
EXP_FUNC const char * STDCALL ssl_get_cert_dn(const SSL *ssl, int component)
21782181
{
2179-
printf(unsupported_str);
2182+
printf("%s", unsupported_str);
21802183
return NULL;
21812184
}
21822185

21832186
EXP_FUNC const char * STDCALL ssl_get_cert_subject_alt_dnsname(const SSL *ssl, int index)
21842187
{
2185-
printf(unsupported_str);
2188+
printf("%s", unsupported_str);
21862189
return NULL;
21872190
}
21882191

ssl/tls1_svr.c

-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ int do_svr_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
117117
static int process_client_hello(SSL *ssl)
118118
{
119119
uint8_t *buf = ssl->bm_data;
120-
uint8_t *record_buf = ssl->hmac_header;
121120
int pkt_size = ssl->bm_index;
122121
int i, j, cs_len, id_len, offset = 6 + SSL_RANDOM_SIZE;
123122
int ret = SSL_OK;

0 commit comments

Comments
 (0)