WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

handel poly1305 warning and clean up commented out compatibility layer includes

pull/1/head
Jacob Barthelmeh 2015-01-08 15:33:44 -07:00
parent 2951ef5b97
commit 2d3c607acd
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/internal.c
View File

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* Name change compatibility layer */
//#include <cyassl/ssl.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>

3
src/keys.c
View File

@ -2311,7 +2311,8 @@ static int SetAuthKeys(OneTimeAuth* authentication, Keys* keys,
(Poly1305*)XMALLOC(sizeof(Poly1305), heap, DYNAMIC_TYPE_CIPHER); (Poly1305*)XMALLOC(sizeof(Poly1305), heap, DYNAMIC_TYPE_CIPHER);
if (authentication && authentication->poly1305 == NULL) if (authentication && authentication->poly1305 == NULL)
return MEMORY_E; return MEMORY_E;
authentication->setup = 1; if (authentication)
authentication->setup = 1;
#endif #endif
(void)heap; (void)heap;
(void)keys; (void)keys;

3
src/ssl.c
View File

@ -19,9 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
/* Name change compatibility layer */
//#include <cyassl/ssl.h>
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif

4
wolfssl/internal.h
View File

@ -1598,7 +1598,7 @@ typedef struct Ciphers {
#ifdef HAVE_CAMELLIA #ifdef HAVE_CAMELLIA
Camellia* cam; Camellia* cam;
#endif #endif
#ifdef HAVE_CHACHA #ifdef HAVE_CHACHA
ChaCha* chacha; ChaCha* chacha;
#endif #endif
#ifdef HAVE_HC128 #ifdef HAVE_HC128
@ -1614,7 +1614,7 @@ typedef struct Ciphers {
#ifdef HAVE_ONE_TIME_AUTH #ifdef HAVE_ONE_TIME_AUTH
/* Ciphers for one time authentication such as poly1305 */ /* Ciphers for one time authentication such as poly1305 */
typedef struct OneTimeAuth { typedef struct OneTimeAuth {
#ifdef HAVE_POLY1305 #ifdef HAVE_POLY1305
Poly1305* poly1305; Poly1305* poly1305;
#endif #endif
byte setup; /* flag for if a cipher has been set */ byte setup; /* flag for if a cipher has been set */