wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-03 12:44:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek
2014-03-21 09:34:08 -07:00
parent 1e041abf04 a0d4c34900
commit 08ae775406
5 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client-test.sh
View File

@@ -5,12 +5,12 @@
[ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1 [ ! -x ./examples/client/client ] && echo -e "\n\nClient doesn't exist" && exit 1
# is our desired server there? # is our desired server there?
ping -c 3 www.google.com ping -c 2 -i 0.2 www.google.com
RESULT=$? RESULT=$?
[ $RESULT -ne 0 ] && echo -e "\n\nCouldn't find server, skipping" && exit 0 [ $RESULT -ne 0 ] && echo -e "\n\nCouldn't find server, skipping" && exit 0
# client test against the server # client test against the server
./examples/client/client -h www.google.com -p 443 -g -d -v 1 ./examples/client/client -h www.google.com -p 443 -g -d
RESULT=$? RESULT=$?
[ $RESULT -ne 0 ] && echo -e "\n\nClient connection failed" && exit 1 [ $RESULT -ne 0 ] && echo -e "\n\nClient connection failed" && exit 1

15
ctaocrypt/src/coding.c
View File

@@ -324,10 +324,20 @@ int Base64_EncodeEsc(const byte* in, word32 inLen, byte* out, word32* outLen)
} }
#endif /* defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(CYASSL_KEY_GEN) || defined(CYASSL_CERT_GEN) || defined(HAVE_WEBSERVER) */
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(HAVE_FIPS)
static static
const byte hexDecode[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, const byte hexDecode[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
10, 11, 12, 13, 14, 15 10, 11, 12, 13, 14, 15, /* upper case A-F */
BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
BAD, BAD, BAD, BAD, BAD, BAD, BAD, BAD,
BAD, BAD, /* G - ` */
10, 11, 12, 13, 14, 15 /* lower case a-f */
}; /* A starts at 0x41 not 0x3A */ }; /* A starts at 0x41 not 0x3A */
int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen) int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
@@ -384,5 +394,6 @@ int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen)
} }
#endif /* defined(OPENSSL_EXTRA) || defined (SESSION_CERTS) || defined(CYASSL_KEY_GEN) || defined(CYASSL_CERT_GEN) || defined(HAVE_WEBSERVER) */ #endif /* (OPENSSL_EXTRA) || (HAVE_WEBSERVER) || (HAVE_FIPS) */
#endif /* NO_CODING */ #endif /* NO_CODING */

2
cyassl/ctaocrypt/aes.h
View File

@@ -159,7 +159,7 @@ CYASSL_API int AesCcmDecrypt(Aes* aes, byte* out, const byte* in, word32 inSz,
CYASSL_API int AesCbcDecrypt_fips(Aes* aes, byte* out, const byte* in, CYASSL_API int AesCbcDecrypt_fips(Aes* aes, byte* out, const byte* in,
word32 sz); word32 sz);
#ifndef FIPS_NO_WRAPPERS #ifndef FIPS_NO_WRAPPERS
/* if not internal or fips.c consumer force fips calls if fips build */ /* if not impl or fips.c impl wrapper force fips calls if fips build */
#define AesSetKey AesSetKey_fips #define AesSetKey AesSetKey_fips
#define AesCbcEncrypt AesCbcEncrypt_fips #define AesCbcEncrypt AesCbcEncrypt_fips
#define AesCbcDecrypt AesCbcDecrypt_fips #define AesCbcDecrypt AesCbcDecrypt_fips

6
cyassl/ctaocrypt/coding.h
View File

@@ -42,10 +42,14 @@ CYASSL_LOCAL int Base64_Decode(const byte* in, word32 inLen, byte* out,
CYASSL_API CYASSL_API
int Base64_EncodeEsc(const byte* in, word32 inLen, byte* out, int Base64_EncodeEsc(const byte* in, word32 inLen, byte* out,
word32* outLen); word32* outLen);
CYASSL_LOCAL #endif
#if defined(OPENSSL_EXTRA) || defined(HAVE_WEBSERVER) || defined(HAVE_FIPS)
CYASSL_API
int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen); int Base16_Decode(const byte* in, word32 inLen, byte* out, word32* outLen);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
} /* extern "C" */ } /* extern "C" */
#endif #endif

2
sslSniffer/sslSnifferTest/snifftest.c
View File

@@ -273,7 +273,7 @@ int main(int argc, char** argv)
packetNumber++; packetNumber++;
if (packet) { if (packet) {
byte data[65535]; byte data[65535+16384]; /* may have a partial 16k record cached */
if (header.caplen > 40) { /* min ip(20) + min tcp(20) */ if (header.caplen > 40) { /* min ip(20) + min tcp(20) */
packet += frame; packet += frame;