mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change of some header file macros

Browse Source
This commit is contained in:
Jacob Barthelmeh 2015-01-05 14:59:48 -07:00
parent 53ddf53a45
commit 15554342c2
6 changed files with 81 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

149
wolfssl/wolfcrypt/aes.h
View File

@ -29,8 +29,8 @@
#include <wolfssl/wolfcrypt/types.h> #include <wolfssl/wolfcrypt/types.h>
/* included for fips @wc_fips */ /* included for fips @wc_fips */
#include <cyassl/ctaocrypt/aes.h>
#ifdef HAVE_FIPS #ifdef HAVE_FIPS
#include <cyassl/ctaocrypt/aes.h>
#if defined(CYASSL_AES_COUNTER) && !defined(WOLFSSL_AES_COUNTER) #if defined(CYASSL_AES_COUNTER) && !defined(WOLFSSL_AES_COUNTER)
#define WOLFSSL_AES_COUNTER #define WOLFSSL_AES_COUNTER
#endif #endif
@ -40,94 +40,95 @@
#endif #endif
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#define CTAO_CRYPT_AES_H
#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
#include <wolfssl/ctaocrypt/logging.h> #include <wolfssl/ctaocrypt/logging.h>
#include "cavium_common.h" #include "cavium_common.h"
#endif #endif
//#ifdef WOLFSSL_AESNI #ifdef WOLFSSL_AESNI
//
//#include <wmmintrin.h> #include <wmmintrin.h>
//
//#if !defined (ALIGN16) #if !defined (ALIGN16)
// #if defined (__GNUC__) #if defined (__GNUC__)
// #define ALIGN16 __attribute__ ( (aligned (16))) #define ALIGN16 __attribute__ ( (aligned (16)))
// #elif defined(_MSC_VER) #elif defined(_MSC_VER)
// /* disable align warning, we want alignment ! */ /* disable align warning, we want alignment ! */
// #pragma warning(disable: 4324) #pragma warning(disable: 4324)
// #define ALIGN16 __declspec (align (16)) #define ALIGN16 __declspec (align (16))
// #else #else
// #define ALIGN16 #define ALIGN16
// #endif #endif
//#endif #endif
//
//#endif /* WOLFSSL_AESNI */ #endif /* WOLFSSL_AESNI */
//
//#if !defined (ALIGN16) #if !defined (ALIGN16)
// #define ALIGN16 #define ALIGN16
//#endif #endif
#endif /* HAVE_FIPS */ #endif /* HAVE_FIPS */
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#if !defined(HAVE_FIPS) && !defined(CTAO_CRYPT_AES_H) #ifndef HAVE_FIPS
//#define WOLFSSL_AES_CAVIUM_MAGIC 0xBEEF0002 #define WOLFSSL_AES_CAVIUM_MAGIC 0xBEEF0002
//
//enum { enum {
// AES_ENC_TYPE = 1, /* cipher unique type */ AES_ENC_TYPE = 1, /* cipher unique type */
// AES_ENCRYPTION = 0, AES_ENCRYPTION = 0,
// AES_DECRYPTION = 1, AES_DECRYPTION = 1,
// AES_BLOCK_SIZE = 16 AES_BLOCK_SIZE = 16
//}; };
//
//
//typedef struct Aes { typedef struct Aes {
// /* AESNI needs key first, rounds 2nd, not sure why yet */ /* AESNI needs key first, rounds 2nd, not sure why yet */
// ALIGN16 word32 key[60]; ALIGN16 word32 key[60];
// word32 rounds; word32 rounds;
//
// ALIGN16 word32 reg[AES_BLOCK_SIZE / sizeof(word32)]; /* for CBC mode */ ALIGN16 word32 reg[AES_BLOCK_SIZE / sizeof(word32)]; /* for CBC mode */
// ALIGN16 word32 tmp[AES_BLOCK_SIZE / sizeof(word32)]; /* same */ ALIGN16 word32 tmp[AES_BLOCK_SIZE / sizeof(word32)]; /* same */
//
//#ifdef HAVE_AESGCM #ifdef HAVE_AESGCM
// ALIGN16 byte H[AES_BLOCK_SIZE]; ALIGN16 byte H[AES_BLOCK_SIZE];
//#ifdef GCM_TABLE #ifdef GCM_TABLE
// /* key-based fast multiplication table. */ /* key-based fast multiplication table. */
// ALIGN16 byte M0[256][AES_BLOCK_SIZE]; ALIGN16 byte M0[256][AES_BLOCK_SIZE];
//#endif /* GCM_TABLE */ #endif /* GCM_TABLE */
//#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
//#ifdef WOLFSSL_AESNI #ifdef WOLFSSL_AESNI
// byte use_aesni; byte use_aesni;
//#endif /* WOLFSSL_AESNI */ #endif /* WOLFSSL_AESNI */
//#ifdef HAVE_CAVIUM #ifdef HAVE_CAVIUM
// AesType type; /* aes key type */ AesType type; /* aes key type */
// int devId; /* nitrox device id */ int devId; /* nitrox device id */
// word32 magic; /* using cavium magic */ word32 magic; /* using cavium magic */
// word64 contextHandle; /* nitrox context memory handle */ word64 contextHandle; /* nitrox context memory handle */
//#endif #endif
//#ifdef WOLFSSL_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
// word32 left; /* unsued bytes left from last call */ word32 left; /* unsued bytes left from last call */
//#endif #endif
//#ifdef WOLFSSL_PIC32MZ_CRYPT #ifdef WOLFSSL_PIC32MZ_CRYPT
// word32 key_ce[AES_BLOCK_SIZE*2/sizeof(word32)] ; word32 key_ce[AES_BLOCK_SIZE*2/sizeof(word32)] ;
// word32 iv_ce [AES_BLOCK_SIZE /sizeof(word32)] ; word32 iv_ce [AES_BLOCK_SIZE /sizeof(word32)] ;
// int keylen ; int keylen ;
//#endif #endif
//} Aes; } Aes;
//
//
//#ifdef HAVE_AESGCM #ifdef HAVE_AESGCM
//typedef struct Gmac { typedef struct Gmac {
// Aes aes; Aes aes;
//} Gmac; } Gmac;
//#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#endif /* HAVE_FIPS */ #endif /* HAVE_FIPS */
WOLFSSL_API int wc_AesSetKey(Aes* aes, const byte* key, word32 len, const byte* iv, WOLFSSL_API int wc_AesSetKey(Aes* aes, const byte* key, word32 len, const byte* iv,
int dir); int dir);
WOLFSSL_API int wc_AesSetIV(Aes* aes, const byte* iv); WOLFSSL_API int wc_AesSetIV(Aes* aes, const byte* iv);
WOLFSSL_API int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz); WOLFSSL_API int wc_AesCbcEncrypt(Aes* aes, byte* out, const byte* in, word32 sz);
WOLFSSL_API int wc_AesCbcDecrypt(Aes* aes, byte* out, const byte* in, word32 sz); WOLFSSL_API int wc_AesCbcDecrypt(Aes* aes, byte* out, const byte* in, word32 sz);
WOLFSSL_API int wc_AesCbcDecryptWithKey(byte* out, const byte* in, word32 inSz, WOLFSSL_API int wc_AesCbcDecryptWithKey(byte* out, const byte* in, word32 inSz,

1
wolfssl/wolfcrypt/des3.h
View File

@ -38,6 +38,7 @@
#endif #endif
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#define CTAO_CRYPT_DES3_H
#define WOLFSSL_3DES_CAVIUM_MAGIC 0xBEEF0003 #define WOLFSSL_3DES_CAVIUM_MAGIC 0xBEEF0003
enum { enum {

1
wolfssl/wolfcrypt/hmac.h
View File

@ -62,6 +62,7 @@
extern "C" { extern "C" {
#endif #endif
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#define CTAO_CRYPT_HMAC_H
#define WOLFSSL_HMAC_CAVIUM_MAGIC 0xBEEF0005 #define WOLFSSL_HMAC_CAVIUM_MAGIC 0xBEEF0005
enum { enum {

1
wolfssl/wolfcrypt/sha.h
View File

@ -37,6 +37,7 @@
extern "C" { extern "C" {
#endif #endif
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#define CTAO_CRYPT_SHA_H
/* in bytes */ /* in bytes */
enum { enum {

1
wolfssl/wolfcrypt/sha256.h
View File

@ -38,6 +38,7 @@
#endif #endif
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#define CTAO_CRYPT_SHA256_H
#ifdef WOLFSSL_PIC32MZ_HASH #ifdef WOLFSSL_PIC32MZ_HASH
#include "port/pic32/pic32mz-crypt.h" #include "port/pic32/pic32mz-crypt.h"
#endif #endif

1
wolfssl/wolfcrypt/sha512.h
View File

@ -37,6 +37,7 @@
#endif #endif
#ifndef HAVE_FIPS #ifndef HAVE_FIPS
#define CTAO_CRYPT_SHA512_H
/* in bytes */ /* in bytes */
enum { enum {
SHA512 = 4, /* hash type unique */ SHA512 = 4, /* hash type unique */