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

fix clang warnings on test.h

Browse Source
This commit is contained in:
toddouska
2012-08-02 17:37:08 -07:00
parent 802d62513f
commit 644726a3fc
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
cyassl/test.h
View File

@@ -7,6 +7,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <cyassl/ssl.h>
#include <cyassl/ctaocrypt/types.h> #include <cyassl/ctaocrypt/types.h>
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
@@ -44,6 +45,7 @@
#pragma warning(disable:4244 4996) #pragma warning(disable:4244 4996)
#endif #endif
#if defined(__MACH__) || defined(USE_WINDOWS_API) #if defined(__MACH__) || defined(USE_WINDOWS_API)
#ifndef _SOCKLEN_T #ifndef _SOCKLEN_T
typedef int socklen_t; typedef int socklen_t;
@@ -100,19 +102,19 @@
#define CLIENT_DEFAULT_VERSION 3 #define CLIENT_DEFAULT_VERSION 3
/* all certs relative to CyaSSL home directory now */ /* all certs relative to CyaSSL home directory now */
static const char* caCert = "./certs/ca-cert.pem"; #define caCert "./certs/ca-cert.pem"
static const char* eccCert = "./certs/server-ecc.pem"; #define eccCert "./certs/server-ecc.pem"
static const char* eccKey = "./certs/ecc-key.pem"; #define eccKey "./certs/ecc-key.pem"
static const char* svrCert = "./certs/server-cert.pem"; #define svrCert "./certs/server-cert.pem"
static const char* svrKey = "./certs/server-key.pem"; #define svrKey "./certs/server-key.pem"
static const char* cliCert = "./certs/client-cert.pem"; #define cliCert "./certs/client-cert.pem"
static const char* cliKey = "./certs/client-key.pem"; #define cliKey "./certs/client-key.pem"
static const char* ntruCert = "./certs/ntru-cert.pem"; #define ntruCert "./certs/ntru-cert.pem"
static const char* ntruKey = "./certs/ntru-key.raw"; #define ntruKey "./certs/ntru-key.raw"
static const char* dhParam = "./certs/dh2048.pem"; #define dhParam "./certs/dh2048.pem"
static const char* cliEccKey = "./certs/ecc-client-key.pem"; #define cliEccKey "./certs/ecc-client-key.pem"
static const char* cliEccCert = "./certs/client-ecc-cert.pem"; #define cliEccCert "./certs/client-ecc-cert.pem"
static const char* crlPemDir = "./certs/crl"; #define crlPemDir "./certs/crl"
typedef struct tcp_ready { typedef struct tcp_ready {
int ready; /* predicate */ int ready; /* predicate */
@@ -157,7 +159,7 @@ static INLINE void err_sys(const char* msg)
extern int myoptind; extern int myoptind;
extern char* myoptarg; extern char* myoptarg;
static int mygetopt(int argc, char** argv, char* optstring) static INLINE int mygetopt(int argc, char** argv, char* optstring)
{ {
static char* next = NULL; static char* next = NULL;
@@ -222,7 +224,7 @@ static int mygetopt(int argc, char** argv, char* optstring)
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
static int PasswordCallBack(char* passwd, int sz, int rw, void* userdata) static INLINE int PasswordCallBack(char* passwd, int sz, int rw, void* userdata)
{ {
strncpy(passwd, "yassl123", sz); strncpy(passwd, "yassl123", sz);
return 8; return 8;
@@ -623,7 +625,7 @@ static INLINE unsigned int my_psk_server_cb(CYASSL* ssl, const char* identity,
#ifdef VERIFY_CALLBACK #ifdef VERIFY_CALLBACK
static int myVerify(int preverify, CYASSL_X509_STORE_CTX* store) static INLINE int myVerify(int preverify, CYASSL_X509_STORE_CTX* store)
{ {
char buffer[80]; char buffer[80];
@@ -655,7 +657,7 @@ static int myVerify(int preverify, CYASSL_X509_STORE_CTX* store)
#ifdef HAVE_CRL #ifdef HAVE_CRL
static void CRL_CallBack(const char* url) static void INLINE CRL_CallBack(const char* url)
{ {
printf("CRL callback url = %s\n", url); printf("CRL callback url = %s\n", url);
} }