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

Some fixes after scan-build.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@193 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
This commit is contained in:
cameronrich 2011-01-09 22:19:05 +00:00
parent 9e1cb29c54
commit 7ddde6ec6b
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssl/test/ssltest.c
View File

@ -515,7 +515,6 @@ static int RSA_test(void)
bigint *plaintext_bi; bigint *plaintext_bi;
bigint *enc_data_bi, *dec_data_bi; bigint *enc_data_bi, *dec_data_bi;
uint8_t enc_data2[128], dec_data2[128]; uint8_t enc_data2[128], dec_data2[128];
int size;
int len; int len;
uint8_t *buf; uint8_t *buf;
@ -546,7 +545,7 @@ static int RSA_test(void)
} }
RSA_encrypt(rsa_ctx, (const uint8_t *)"abc", 3, enc_data2, 0); RSA_encrypt(rsa_ctx, (const uint8_t *)"abc", 3, enc_data2, 0);
size = RSA_decrypt(rsa_ctx, enc_data2, dec_data2, 1); RSA_decrypt(rsa_ctx, enc_data2, dec_data2, 1);
if (memcmp("abc", dec_data2, 3)) if (memcmp("abc", dec_data2, 3))
{ {
printf("Error: ENCRYPT/DECRYPT #2 failed\n"); printf("Error: ENCRYPT/DECRYPT #2 failed\n");
@ -921,17 +920,14 @@ static int SSL_server_test(
if (size == SSL_CLOSE_NOTIFY) if (size == SSL_CLOSE_NOTIFY)
{ {
ret = SSL_OK; /* do nothing */
} }
else if (size < SSL_OK) /* got some alert or something nasty */ else if (size < SSL_OK) /* got some alert or something nasty */
{ {
ret = size; ret = size;
if (ret == SSL_ERROR_CONN_LOST) if (ret == SSL_ERROR_CONN_LOST)
{
ret = SSL_OK;
continue; continue;
}
break; /* we've got a problem */ break; /* we've got a problem */
} }
@ -1092,7 +1088,6 @@ int SSL_server_tests(void)
printf("SSL server test \"%s\" passed\n", "Bad Before Cert"); printf("SSL server test \"%s\" passed\n", "Bad Before Cert");
TTY_FLUSH(); TTY_FLUSH();
ret = 0; /* is ok */
} }
/* this test should fail */ /* this test should fail */

7
ssl/tls1_clnt.c
View File

@ -51,7 +51,6 @@ 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)
{ {
SSL *ssl; SSL *ssl;
int ret;
SOCKET_BLOCK(client_fd); /* ensure blocking mode */ SOCKET_BLOCK(client_fd); /* ensure blocking mode */
ssl = ssl_new(ssl_ctx, client_fd); ssl = ssl_new(ssl_ctx, client_fd);
@ -70,7 +69,7 @@ EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
} }
SET_SSL_FLAG(SSL_IS_CLIENT); SET_SSL_FLAG(SSL_IS_CLIENT);
ret = do_client_connect(ssl); do_client_connect(ssl);
return ssl; return ssl;
} }
@ -130,6 +129,10 @@ int do_clnt_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
disposable_new(ssl); disposable_new(ssl);
ret = do_client_connect(ssl); ret = do_client_connect(ssl);
break; break;
default:
ret = SSL_ERROR_INVALID_HANDSHAKE;
break;
} }
return ret; return ret;