feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

fix snifftest and aesni with new warnings

Browse Source
This commit is contained in:
toddouska
2012-09-25 11:14:21 -07:00
parent 2c0e7fd8e9
commit d0affb0d0e
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ctaocrypt/src/aes.c
View File

@@ -777,8 +777,8 @@ void AES_256_Key_Expansion(const unsigned char* userkey,
unsigned char* key_schedule); unsigned char* key_schedule);
int AES_set_encrypt_key (const unsigned char *userKey, const int bits, static int AES_set_encrypt_key(const unsigned char *userKey, const int bits,
Aes* aes) Aes* aes)
{ {
if (!userKey || !aes) if (!userKey || !aes)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@@ -799,8 +799,8 @@ int AES_set_encrypt_key (const unsigned char *userKey, const int bits,
} }
int AES_set_decrypt_key (const unsigned char* userKey, const int bits, static int AES_set_decrypt_key(const unsigned char* userKey, const int bits,
Aes* aes) Aes* aes)
{ {
int nr; int nr;
Aes temp_key; Aes temp_key;

14
sslSniffer/sslSnifferTest/snifftest.c
View File

@@ -79,14 +79,16 @@ static void sig_handler(const int sig)
#ifndef _WIN32 #ifndef _WIN32
ssl_FreeSniffer(); ssl_FreeSniffer();
#endif #endif
exit(EXIT_SUCCESS); if (sig)
exit(EXIT_SUCCESS);
} }
static void err_sys(const char* msg) static void err_sys(const char* msg)
{ {
fprintf(stderr, "%s\n", msg); fprintf(stderr, "%s\n", msg);
exit(EXIT_FAILURE); if (msg)
exit(EXIT_FAILURE);
} }
@@ -149,7 +151,9 @@ int main(int argc, char** argv)
" installed correctly and you have sufficient permissions"); " installed correctly and you have sufficient permissions");
printf("Enter the interface number (1-%d): ", i); printf("Enter the interface number (1-%d): ", i);
scanf("%d", &inum); ret = scanf("%d", &inum);
if (ret != 1)
printf("scanf port failed\n");
if (inum < 1 || inum > i) if (inum < 1 || inum > i)
err_sys("Interface number out of range"); err_sys("Interface number out of range");
@@ -196,7 +200,9 @@ int main(int argc, char** argv)
if (ret != 0) printf("pcap_activate failed %s\n", pcap_geterr(pcap)); if (ret != 0) printf("pcap_activate failed %s\n", pcap_geterr(pcap));
printf("Enter the port to scan: "); printf("Enter the port to scan: ");
scanf("%d", &port); ret = scanf("%d", &port);
if (ret != 1)
printf("scanf port failed\n");
SNPRINTF(filter, sizeof(filter), "tcp and port %d", port); SNPRINTF(filter, sizeof(filter), "tcp and port %d", port);