Skip to content

Commit 17c37ae

Browse files
committed
moved cyassl -> wolfssl
1 parent 881c0b9 commit 17c37ae

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+7649
-5743
lines changed

IDE/MDK5-ARM/Projects/CyaSSL-Full/client.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
421421
switch (version) {
422422
#ifndef NO_OLD_TLS
423423
case 0:
424-
method = CyaSSLv3_client_method();
424+
method = wolfSSLv3_client_method();
425425
break;
426426

427427

IDE/MDK5-ARM/Projects/CyaSSL-Full/echoserver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
128128
#elif !defined(NO_TLS)
129129
method = CyaSSLv23_server_method();
130130
#else
131-
method = CyaSSLv3_server_method();
131+
method = wolfSSLv3_server_method();
132132
#endif
133133
ctx = CyaSSL_CTX_new(method);
134134
/* CyaSSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); */

IDE/MDK5-ARM/Projects/EchoServer/echoserver.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ THREAD_RETURN CYASSL_THREAD echoserver_test(void* args)
128128
#elif !defined(NO_TLS)
129129
method = CyaSSLv23_server_method();
130130
#else
131-
method = CyaSSLv3_server_method();
131+
method = wolfSSLv3_server_method();
132132
#endif
133133
ctx = CyaSSL_CTX_new(method);
134134
/* CyaSSL_CTX_set_session_cache_mode(ctx, SSL_SESS_CACHE_OFF); */

IDE/MDK5-ARM/Projects/SimpleClient/client.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ THREAD_RETURN CYASSL_THREAD client_test(void* args)
423423
switch (version) {
424424
#ifndef NO_OLD_TLS
425425
case 0:
426-
method = CyaSSLv3_client_method();
426+
method = wolfSSLv3_client_method();
427427
break;
428428

429429

cyassl/callbacks.h

+1-59
Original file line numberDiff line numberDiff line change
@@ -19,62 +19,4 @@
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
2020
*/
2121

22-
23-
#ifndef CYASSL_CALLBACKS_H
24-
#define CYASSL_CALLBACKS_H
25-
26-
#include <sys/time.h>
27-
28-
#ifdef __cplusplus
29-
extern "C" {
30-
#endif
31-
32-
33-
enum { /* CALLBACK CONTSTANTS */
34-
MAX_PACKETNAME_SZ = 24,
35-
MAX_CIPHERNAME_SZ = 24,
36-
MAX_TIMEOUT_NAME_SZ = 24,
37-
MAX_PACKETS_HANDSHAKE = 14, /* 12 for client auth plus 2 alerts */
38-
MAX_VALUE_SZ = 128, /* all handshake packets but Cert should
39-
fit here */
40-
};
41-
42-
43-
typedef struct handShakeInfo_st {
44-
char cipherName[MAX_CIPHERNAME_SZ + 1]; /* negotiated cipher */
45-
char packetNames[MAX_PACKETS_HANDSHAKE][MAX_PACKETNAME_SZ + 1];
46-
/* SSL packet names */
47-
int numberPackets; /* actual # of packets */
48-
int negotiationError; /* cipher/parameter err */
49-
} HandShakeInfo;
50-
51-
52-
typedef struct timeval Timeval;
53-
54-
55-
typedef struct packetInfo_st {
56-
char packetName[MAX_PACKETNAME_SZ + 1]; /* SSL packet name */
57-
Timeval timestamp; /* when it occured */
58-
unsigned char value[MAX_VALUE_SZ]; /* if fits, it's here */
59-
unsigned char* bufferValue; /* otherwise here (non 0) */
60-
int valueSz; /* sz of value or buffer */
61-
} PacketInfo;
62-
63-
64-
typedef struct timeoutInfo_st {
65-
char timeoutName[MAX_TIMEOUT_NAME_SZ + 1]; /* timeout Name */
66-
int flags; /* for future use */
67-
int numberPackets; /* actual # of packets */
68-
PacketInfo packets[MAX_PACKETS_HANDSHAKE]; /* list of all packets */
69-
Timeval timeoutValue; /* timer that caused it */
70-
} TimeoutInfo;
71-
72-
73-
74-
#ifdef __cplusplus
75-
} /* extern "C" */
76-
#endif
77-
78-
79-
#endif /* CYASSL_CALLBACKS_H */
80-
22+
#include <wolfssl/callbacks.h>

cyassl/certs_test.h

+1-1,176
Large diffs are not rendered by default.

cyassl/crl.h

+1-30
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,4 @@
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
2020
*/
2121

22-
23-
#ifndef CYASSL_CRL_H
24-
#define CYASSL_CRL_H
25-
26-
27-
#ifdef HAVE_CRL
28-
29-
#include <cyassl/ssl.h>
30-
#include <cyassl/ctaocrypt/asn.h>
31-
32-
#ifdef __cplusplus
33-
extern "C" {
34-
#endif
35-
36-
typedef struct CYASSL_CRL CYASSL_CRL;
37-
38-
CYASSL_LOCAL int InitCRL(CYASSL_CRL*, CYASSL_CERT_MANAGER*);
39-
CYASSL_LOCAL void FreeCRL(CYASSL_CRL*, int dynamic);
40-
41-
CYASSL_LOCAL int LoadCRL(CYASSL_CRL* crl, const char* path, int type, int mon);
42-
CYASSL_LOCAL int BufferLoadCRL(CYASSL_CRL*, const byte*, long, int);
43-
CYASSL_LOCAL int CheckCertCRL(CYASSL_CRL*, DecodedCert*);
44-
45-
46-
#ifdef __cplusplus
47-
} /* extern "C" */
48-
#endif
49-
50-
#endif /* HAVE_CRL */
51-
#endif /* CYASSL_CRL_H */
22+
#include <wolfssl/crl.h>

cyassl/error-ssl.h

+1-141
Original file line numberDiff line numberDiff line change
@@ -19,144 +19,4 @@
1919
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
2020
*/
2121

22-
23-
#ifndef CYASSL_ERROR_H
24-
#define CYASSL_ERROR_H
25-
26-
#include <cyassl/ctaocrypt/error-crypt.h> /* pull in CTaoCrypt errors */
27-
28-
#ifdef __cplusplus
29-
extern "C" {
30-
#endif
31-
32-
enum CyaSSL_ErrorCodes {
33-
INPUT_CASE_ERROR = -301, /* process input state error */
34-
PREFIX_ERROR = -302, /* bad index to key rounds */
35-
MEMORY_ERROR = -303, /* out of memory */
36-
VERIFY_FINISHED_ERROR = -304, /* verify problem on finished */
37-
VERIFY_MAC_ERROR = -305, /* verify mac problem */
38-
PARSE_ERROR = -306, /* parse error on header */
39-
UNKNOWN_HANDSHAKE_TYPE = -307, /* weird handshake type */
40-
SOCKET_ERROR_E = -308, /* error state on socket */
41-
SOCKET_NODATA = -309, /* expected data, not there */
42-
INCOMPLETE_DATA = -310, /* don't have enough data to
43-
complete task */
44-
UNKNOWN_RECORD_TYPE = -311, /* unknown type in record hdr */
45-
DECRYPT_ERROR = -312, /* error during decryption */
46-
FATAL_ERROR = -313, /* recvd alert fatal error */
47-
ENCRYPT_ERROR = -314, /* error during encryption */
48-
FREAD_ERROR = -315, /* fread problem */
49-
NO_PEER_KEY = -316, /* need peer's key */
50-
NO_PRIVATE_KEY = -317, /* need the private key */
51-
RSA_PRIVATE_ERROR = -318, /* error during rsa priv op */
52-
NO_DH_PARAMS = -319, /* server missing DH params */
53-
BUILD_MSG_ERROR = -320, /* build message failure */
54-
55-
BAD_HELLO = -321, /* client hello malformed */
56-
DOMAIN_NAME_MISMATCH = -322, /* peer subject name mismatch */
57-
WANT_READ = -323, /* want read, call again */
58-
NOT_READY_ERROR = -324, /* handshake layer not ready */
59-
PMS_VERSION_ERROR = -325, /* pre m secret version error */
60-
VERSION_ERROR = -326, /* record layer version error */
61-
WANT_WRITE = -327, /* want write, call again */
62-
BUFFER_ERROR = -328, /* malformed buffer input */
63-
VERIFY_CERT_ERROR = -329, /* verify cert error */
64-
VERIFY_SIGN_ERROR = -330, /* verify sign error */
65-
CLIENT_ID_ERROR = -331, /* psk client identity error */
66-
SERVER_HINT_ERROR = -332, /* psk server hint error */
67-
PSK_KEY_ERROR = -333, /* psk key error */
68-
ZLIB_INIT_ERROR = -334, /* zlib init error */
69-
ZLIB_COMPRESS_ERROR = -335, /* zlib compression error */
70-
ZLIB_DECOMPRESS_ERROR = -336, /* zlib decompression error */
71-
72-
GETTIME_ERROR = -337, /* gettimeofday failed ??? */
73-
GETITIMER_ERROR = -338, /* getitimer failed ??? */
74-
SIGACT_ERROR = -339, /* sigaction failed ??? */
75-
SETITIMER_ERROR = -340, /* setitimer failed ??? */
76-
LENGTH_ERROR = -341, /* record layer length error */
77-
PEER_KEY_ERROR = -342, /* can't decode peer key */
78-
ZERO_RETURN = -343, /* peer sent close notify */
79-
SIDE_ERROR = -344, /* wrong client/server type */
80-
NO_PEER_CERT = -345, /* peer didn't send key */
81-
NTRU_KEY_ERROR = -346, /* NTRU key error */
82-
NTRU_DRBG_ERROR = -347, /* NTRU drbg error */
83-
NTRU_ENCRYPT_ERROR = -348, /* NTRU encrypt error */
84-
NTRU_DECRYPT_ERROR = -349, /* NTRU decrypt error */
85-
ECC_CURVETYPE_ERROR = -350, /* Bad ECC Curve Type */
86-
ECC_CURVE_ERROR = -351, /* Bad ECC Curve */
87-
ECC_PEERKEY_ERROR = -352, /* Bad Peer ECC Key */
88-
ECC_MAKEKEY_ERROR = -353, /* Bad Make ECC Key */
89-
ECC_EXPORT_ERROR = -354, /* Bad ECC Export Key */
90-
ECC_SHARED_ERROR = -355, /* Bad ECC Shared Secret */
91-
NOT_CA_ERROR = -357, /* Not a CA cert error */
92-
BAD_PATH_ERROR = -358, /* Bad path for opendir */
93-
BAD_CERT_MANAGER_ERROR = -359, /* Bad Cert Manager */
94-
OCSP_CERT_REVOKED = -360, /* OCSP Certificate revoked */
95-
CRL_CERT_REVOKED = -361, /* CRL Certificate revoked */
96-
CRL_MISSING = -362, /* CRL Not loaded */
97-
MONITOR_RUNNING_E = -363, /* CRL Monitor already running */
98-
THREAD_CREATE_E = -364, /* Thread Create Error */
99-
OCSP_NEED_URL = -365, /* OCSP need an URL for lookup */
100-
OCSP_CERT_UNKNOWN = -366, /* OCSP responder doesn't know */
101-
OCSP_LOOKUP_FAIL = -367, /* OCSP lookup not successful */
102-
MAX_CHAIN_ERROR = -368, /* max chain depth exceeded */
103-
COOKIE_ERROR = -369, /* dtls cookie error */
104-
SEQUENCE_ERROR = -370, /* dtls sequence error */
105-
SUITES_ERROR = -371, /* suites pointer error */
106-
SSL_NO_PEM_HEADER = -372, /* no PEM header found */
107-
OUT_OF_ORDER_E = -373, /* out of order message */
108-
BAD_KEA_TYPE_E = -374, /* bad KEA type found */
109-
SANITY_CIPHER_E = -375, /* sanity check on cipher error */
110-
RECV_OVERFLOW_E = -376, /* RXCB returned more than rqed */
111-
GEN_COOKIE_E = -377, /* Generate Cookie Error */
112-
NO_PEER_VERIFY = -378, /* Need peer cert verify Error */
113-
FWRITE_ERROR = -379, /* fwrite problem */
114-
CACHE_MATCH_ERROR = -380, /* chache hdr match error */
115-
UNKNOWN_SNI_HOST_NAME_E = -381, /* Unrecognized host name Error */
116-
UNKNOWN_MAX_FRAG_LEN_E = -382, /* Unrecognized max frag len Error */
117-
KEYUSE_SIGNATURE_E = -383, /* KeyUse digSignature error */
118-
KEYUSE_ENCIPHER_E = -385, /* KeyUse keyEncipher error */
119-
EXTKEYUSE_AUTH_E = -386, /* ExtKeyUse server|client_auth */
120-
SEND_OOB_READ_E = -387, /* Send Cb out of bounds read */
121-
SECURE_RENEGOTIATION_E = -388, /* Invalid Renegotiation Info */
122-
SESSION_TICKET_LEN_E = -389, /* Session Ticket too large */
123-
SESSION_TICKET_EXPECT_E = -390, /* Session Ticket missing */
124-
SCR_DIFFERENT_CERT_E = -391, /* SCR Different cert error */
125-
SESSION_SECRET_CB_E = -392, /* Session secret Cb fcn failure */
126-
NO_CHANGE_CIPHER_E = -393, /* Finished before change cipher */
127-
SANITY_MSG_E = -394, /* Sanity check on msg order error */
128-
DUPLICATE_MSG_E = -395, /* Duplicate message error */
129-
SNI_UNSUPPORTED = -396, /* SSL 3.0 does not support SNI */
130-
131-
/* add strings to SetErrorString !!!!! */
132-
133-
/* begin negotiation parameter errors */
134-
UNSUPPORTED_SUITE = -500, /* unsupported cipher suite */
135-
MATCH_SUITE_ERROR = -501 /* can't match cipher suite */
136-
/* end negotiation parameter errors only 10 for now */
137-
/* add strings to SetErrorString !!!!! */
138-
139-
/* no error stings go down here, add above negotiation errors !!!! */
140-
};
141-
142-
143-
#ifdef CYASSL_CALLBACKS
144-
enum {
145-
MIN_PARAM_ERR = UNSUPPORTED_SUITE,
146-
MAX_PARAM_ERR = MIN_PARAM_ERR - 10
147-
};
148-
#endif
149-
150-
151-
CYASSL_LOCAL
152-
void SetErrorString(int err, char* buff);
153-
154-
155-
#ifdef __cplusplus
156-
} /* extern "C" */
157-
#endif
158-
159-
160-
#endif /* CyaSSL_ERROR_H */
161-
162-
22+
#include <wolfssl/error-ssl.h>

0 commit comments

Comments
 (0)