[Cryptech-Commits] [sw/libhal] 02/06: Merge branch 'config_core_selector'
git at cryptech.is
git at cryptech.is
Mon Nov 16 21:42:42 UTC 2015
This is an automated email from the git hooks/post-receive script.
paul at psgd.org pushed a commit to branch master
in repository sw/libhal.
commit a7037d918cbf60bd829e44ccc6d1522f55d5d8b1
Merge: 49ac884 6ed2c92
Author: Paul Selkirk <paul at psgd.org>
Date: Fri Nov 13 17:53:30 2015 -0500
Merge branch 'config_core_selector'
GNUmakefile | 4 +-
aes_keywrap.c | 47 +++--
core.c | 211 ++++++++++++++++++++
csprng.c | 10 +-
ecdsa.c | 11 +-
hal.h | 481 ++++++++++------------------------------------
hal_io_eim.c | 58 +++---
hal_io_i2c.c | 66 +++----
hash.c | 116 +++++------
modexp.c | 41 ++--
pbkdf2.c | 15 +-
rsa.c | 43 +++--
tests/test-aes-key-wrap.c | 16 +-
tests/test-ecdsa.c | 56 +++---
tests/test-hash.c | 165 ++++++++--------
tests/test-pbkdf2.c | 25 +--
tests/test-rsa.c | 53 +++--
verilog_constants.h | 241 +++++++++++++++++++++++
18 files changed, 908 insertions(+), 751 deletions(-)
diff --cc csprng.c
index 1051bbd,4fc80d0..9517d0d
--- a/csprng.c
+++ b/csprng.c
@@@ -32,9 -32,13 +32,10 @@@
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <assert.h>
#include <stdint.h>
-#include <stddef.h>
-#include <stdio.h>
#include "hal.h"
+ #include "verilog_constants.h"
#ifndef WAIT_FOR_CSPRNG_VALID
#define WAIT_FOR_CSPRNG_VALID 0
diff --cc hal.h
index b266cba,2ae412b..eb1e253
--- a/hal.h
+++ b/hal.h
@@@ -100,323 -43,51 +43,51 @@@
#define bitsToBytes(x) (x / 8)
#endif
-
/*
- * Board segment.
- * Board-level registers and communication channel registers.
+ * Current name and version values.
+ *
+ * Should these even be here? Dunno.
+ * Should the versions be here even if the names should be?
*/
- #define BOARD_ADDR_BASE (SEGMENT_OFFSET_GLOBALS + (0 * CORE_SIZE))
- #define BOARD_ADDR_NAME0 (BOARD_ADDR_BASE + ADDR_NAME0)
- #define BOARD_ADDR_NAME1 (BOARD_ADDR_BASE + ADDR_NAME1)
- #define BOARD_ADDR_VERSION (BOARD_ADDR_BASE + ADDR_VERSION)
- #define BOARD_ADDR_DUMMY (BOARD_ADDR_BASE + 0xFF)
-
- #define COMM_ADDR_BASE (SEGMENT_OFFSET_GLOBALS + (1 * CORE_SIZE))
- #define COMM_ADDR_NAME0 (COMM_ADDR_BASE + ADDR_NAME0)
- #define COMM_ADDR_NAME1 (COMM_ADDR_BASE + ADDR_NAME1)
- #define COMM_ADDR_VERSION (COMM_ADDR_BASE + ADDR_VERSION)
-
- /* Current name and version values */
- #define NOVENA_BOARD_NAME0 "PVT1"
- #define NOVENA_BOARD_NAME1 " "
+
+ #define NOVENA_BOARD_NAME "PVT1 "
#define NOVENA_BOARD_VERSION "0.10"
- #define EIM_INTERFACE_NAME0 "eim "
- #define EIM_INTERFACE_NAME1 " "
+ #define EIM_INTERFACE_NAME "eim "
#define EIM_INTERFACE_VERSION "0.10"
- #define I2C_INTERFACE_NAME0 "i2c "
- #define I2C_INTERFACE_NAME1 " "
+ #define I2C_INTERFACE_NAME "i2c "
#define I2C_INTERFACE_VERSION "0.10"
-
- /*
- * Hashes segment.
- */
-
- /* Addresses common to all hash cores */
- #define ADDR_BLOCK (0x10)
- #define ADDR_DIGEST (0x20) /* except SHA512 */
-
- /* Addresses and codes for the specific hash cores */
- #define SHA1_ADDR_BASE (SEGMENT_OFFSET_HASHES + (0 * CORE_SIZE))
- #define SHA1_ADDR_NAME0 (SHA1_ADDR_BASE + ADDR_NAME0)
- #define SHA1_ADDR_NAME1 (SHA1_ADDR_BASE + ADDR_NAME1)
- #define SHA1_ADDR_VERSION (SHA1_ADDR_BASE + ADDR_VERSION)
- #define SHA1_ADDR_CTRL (SHA1_ADDR_BASE + ADDR_CTRL)
- #define SHA1_ADDR_STATUS (SHA1_ADDR_BASE + ADDR_STATUS)
- #define SHA1_ADDR_BLOCK (SHA1_ADDR_BASE + ADDR_BLOCK)
- #define SHA1_ADDR_DIGEST (SHA1_ADDR_BASE + ADDR_DIGEST)
- #define SHA1_BLOCK_LEN bitsToBytes(512)
- #define SHA1_LENGTH_LEN bitsToBytes(64)
- #define SHA1_DIGEST_LEN bitsToBytes(160)
-
- #define SHA256_ADDR_BASE (SEGMENT_OFFSET_HASHES + (1 * CORE_SIZE))
- #define SHA256_ADDR_NAME0 (SHA256_ADDR_BASE + ADDR_NAME0)
- #define SHA256_ADDR_NAME1 (SHA256_ADDR_BASE + ADDR_NAME1)
- #define SHA256_ADDR_VERSION (SHA256_ADDR_BASE + ADDR_VERSION)
- #define SHA256_ADDR_CTRL (SHA256_ADDR_BASE + ADDR_CTRL)
- #define SHA256_ADDR_STATUS (SHA256_ADDR_BASE + ADDR_STATUS)
- #define SHA256_ADDR_BLOCK (SHA256_ADDR_BASE + ADDR_BLOCK)
- #define SHA256_ADDR_DIGEST (SHA256_ADDR_BASE + ADDR_DIGEST)
- #define SHA256_BLOCK_LEN bitsToBytes(512)
- #define SHA256_LENGTH_LEN bitsToBytes(64)
- #define SHA256_DIGEST_LEN bitsToBytes(256)
-
- #define SHA512_ADDR_BASE (SEGMENT_OFFSET_HASHES + (2 * CORE_SIZE))
- #define SHA512_ADDR_NAME0 (SHA512_ADDR_BASE + ADDR_NAME0)
- #define SHA512_ADDR_NAME1 (SHA512_ADDR_BASE + ADDR_NAME1)
- #define SHA512_ADDR_VERSION (SHA512_ADDR_BASE + ADDR_VERSION)
- #define SHA512_ADDR_CTRL (SHA512_ADDR_BASE + ADDR_CTRL)
- #define SHA512_ADDR_STATUS (SHA512_ADDR_BASE + ADDR_STATUS)
- #define SHA512_ADDR_BLOCK (SHA512_ADDR_BASE + ADDR_BLOCK)
- #define SHA512_ADDR_DIGEST (SHA512_ADDR_BASE + 0x40)
- #define SHA512_BLOCK_LEN bitsToBytes(1024)
- #define SHA512_LENGTH_LEN bitsToBytes(128)
- #define SHA512_224_DIGEST_LEN bitsToBytes(224)
- #define SHA512_256_DIGEST_LEN bitsToBytes(256)
- #define SHA384_DIGEST_LEN bitsToBytes(384)
- #define SHA512_DIGEST_LEN bitsToBytes(512)
- #define MODE_SHA_512_224 (0 << 2)
- #define MODE_SHA_512_256 (1 << 2)
- #define MODE_SHA_384 (2 << 2)
- #define MODE_SHA_512 (3 << 2)
-
- /* Current name and version values */
- #define SHA1_NAME0 "sha1"
- #define SHA1_NAME1 " "
- #define SHA1_VERSION "0.50"
-
- #define SHA256_NAME0 "sha2"
- #define SHA256_NAME1 "-256"
- #define SHA256_VERSION "0.81"
-
- #define SHA512_NAME0 "sha2"
- #define SHA512_NAME1 "-512"
- #define SHA512_VERSION "0.80"
-
-
- /*
- * TRNG segment.
- */
-
- /* addresses and codes for the TRNG cores */
- #define TRNG_ADDR_BASE (SEGMENT_OFFSET_RNGS + (0x00 * CORE_SIZE))
- #define TRNG_ADDR_NAME0 (TRNG_ADDR_BASE + ADDR_NAME0)
- #define TRNG_ADDR_NAME1 (TRNG_ADDR_BASE + ADDR_NAME1)
- #define TRNG_ADDR_VERSION (TRNG_ADDR_BASE + ADDR_VERSION)
- #define TRNG_ADDR_CTRL (TRNG_ADDR_BASE + 0x10)
- #define TRNG_CTRL_DISCARD (1)
- #define TRNG_CTRL_TEST_MODE (2)
- #define TRNG_ADDR_STATUS (TRNG_ADDR_BASE + 0x11)
- /* No status bits defined (yet) */
- #define TRNG_ADDR_DELAY (TRNG_ADDR_BASE + 0x13)
-
- #define ENTROPY1_ADDR_BASE (SEGMENT_OFFSET_RNGS + (0x05 * CORE_SIZE))
- #define ENTROPY1_ADDR_NAME0 (ENTROPY1_ADDR_BASE + ADDR_NAME0)
- #define ENTROPY1_ADDR_NAME1 (ENTROPY1_ADDR_BASE + ADDR_NAME1)
- #define ENTROPY1_ADDR_VERSION (ENTROPY1_ADDR_BASE + ADDR_VERSION)
- #define ENTROPY1_ADDR_CTRL (ENTROPY1_ADDR_BASE + 0x10)
- #define ENTROPY1_CTRL_ENABLE (1)
- #define ENTROPY1_ADDR_STATUS (ENTROPY1_ADDR_BASE + 0x11)
- #define ENTROPY1_STATUS_VALID (1)
- #define ENTROPY1_ADDR_ENTROPY (ENTROPY1_ADDR_BASE + 0x20)
- #define ENTROPY1_ADDR_DELTA (ENTROPY1_ADDR_BASE + 0x30)
-
- #define ENTROPY2_ADDR_BASE (SEGMENT_OFFSET_RNGS + (0x06 * CORE_SIZE))
- #define ENTROPY2_ADDR_NAME0 (ENTROPY2_ADDR_BASE + ADDR_NAME0)
- #define ENTROPY2_ADDR_NAME1 (ENTROPY2_ADDR_BASE + ADDR_NAME1)
- #define ENTROPY2_ADDR_VERSION (ENTROPY2_ADDR_BASE + ADDR_VERSION)
- #define ENTROPY2_ADDR_CTRL (ENTROPY2_ADDR_BASE + 0x10)
- #define ENTROPY2_CTRL_ENABLE (1)
- #define ENTROPY2_ADDR_STATUS (ENTROPY2_ADDR_BASE + 0x11)
- #define ENTROPY2_STATUS_VALID (1)
- #define ENTROPY2_ADDR_OPA (ENTROPY2_ADDR_BASE + 0x18)
- #define ENTROPY2_ADDR_OPB (ENTROPY2_ADDR_BASE + 0x19)
- #define ENTROPY2_ADDR_ENTROPY (ENTROPY2_ADDR_BASE + 0x20)
- #define ENTROPY2_ADDR_RAW (ENTROPY2_ADDR_BASE + 0x21)
- #define ENTROPY2_ADDR_ROSC (ENTROPY2_ADDR_BASE + 0x22)
-
- #define MIXER_ADDR_BASE (SEGMENT_OFFSET_RNGS + (0x0a * CORE_SIZE))
- #define MIXER_ADDR_NAME0 (MIXER_ADDR_BASE + ADDR_NAME0)
- #define MIXER_ADDR_NAME1 (MIXER_ADDR_BASE + ADDR_NAME1)
- #define MIXER_ADDR_VERSION (MIXER_ADDR_BASE + ADDR_VERSION)
- #define MIXER_ADDR_CTRL (MIXER_ADDR_BASE + 0x10)
- #define MIXER_CTRL_ENABLE (1)
- #define MIXER_CTRL_RESTART (2)
- #define MIXER_ADDR_STATUS (MIXER_ADDR_BASE + 0x11)
- /* No status bits defined (yet) */
- #define MIXER_ADDR_TIMEOUT (MIXER_ADDR_BASE + 0x20)
-
- #define CSPRNG_ADDR_BASE (SEGMENT_OFFSET_RNGS + (0x0b * CORE_SIZE))
- #define CSPRNG_ADDR_NAME0 (CSPRNG_ADDR_BASE + ADDR_NAME0)
- #define CSPRNG_ADDR_NAME1 (CSPRNG_ADDR_BASE + ADDR_NAME1)
- #define CSPRNG_ADDR_VERSION (CSPRNG_ADDR_BASE + ADDR_VERSION)
- #define CSPRNG_ADDR_CTRL (CSPRNG_ADDR_BASE + 0x10)
- #define CSPRNG_CTRL_ENABLE (1)
- #define CSPRNG_CTRL_SEED (2)
- #define CSPRNG_ADDR_STATUS (CSPRNG_ADDR_BASE + 0x11)
- #define CSPRNG_STATUS_VALID (1)
- #define CSPRNG_ADDR_RANDOM (CSPRNG_ADDR_BASE + 0x20)
- #define CSPRNG_ADDR_NROUNDS (CSPRNG_ADDR_BASE + 0x40)
- #define CSPRNG_ADDR_NBLOCKS_LO (CSPRNG_ADDR_BASE + 0x41)
- #define CSPRNG_ADDR_NBLOCKS_HI (CSPRNG_ADDR_BASE + 0x42)
-
- /* Current name and version values */
- #define TRNG_NAME0 "trng"
- #define TRNG_NAME1 " "
+ #define TRNG_NAME "trng "
-#define TRNG_VERSION "0.50"
+#define TRNG_VERSION "0.51"
- #define AVALANCHE_ENTROPY_NAME0 "extn"
- #define AVALANCHE_ENTROPY_NAME1 "oise"
+ #define AVALANCHE_ENTROPY_NAME "extnoise"
#define AVALANCHE_ENTROPY_VERSION "0.10"
- #define ROSC_ENTROPY_NAME0 "rosc"
- #define ROSC_ENTROPY_NAME1 " ent"
+ #define ROSC_ENTROPY_NAME "rosc ent"
#define ROSC_ENTROPY_VERSION "0.10"
- #define CSPRNG_NAME0 "cspr"
- #define CSPRNG_NAME1 "ng "
+ #define CSPRNG_NAME "csprng "
#define CSPRNG_VERSION "0.50"
+ #define SHA1_NAME "sha1 "
+ #define SHA1_VERSION "0.50"
+
+ #define SHA256_NAME "sha2-256"
-#define SHA256_VERSION "0.80"
++#define SHA256_VERSION "0.81"
- /*
- * CIPHERS segment.
- */
+ #define SHA512_NAME "sha2-512"
+ #define SHA512_VERSION "0.80"
- /* AES core */
- #define AES_ADDR_BASE (SEGMENT_OFFSET_CIPHERS + (0 * CORE_SIZE))
- #define AES_ADDR_NAME0 (AES_ADDR_BASE + ADDR_NAME0)
- #define AES_ADDR_NAME1 (AES_ADDR_BASE + ADDR_NAME1)
- #define AES_ADDR_VERSION (AES_ADDR_BASE + ADDR_VERSION)
- #define AES_ADDR_CTRL (AES_ADDR_BASE + ADDR_CTRL)
- #define AES_ADDR_STATUS (AES_ADDR_BASE + ADDR_STATUS)
-
- #define AES_ADDR_CONFIG (AES_ADDR_BASE + 0x0a)
- #define AES_CONFIG_ENCDEC (1)
- #define AES_CONFIG_KEYLEN (2)
-
- #define AES_ADDR_KEY0 (AES_ADDR_BASE + 0x10)
- #define AES_ADDR_KEY1 (AES_ADDR_BASE + 0x11)
- #define AES_ADDR_KEY2 (AES_ADDR_BASE + 0x12)
- #define AES_ADDR_KEY3 (AES_ADDR_BASE + 0x13)
- #define AES_ADDR_KEY4 (AES_ADDR_BASE + 0x14)
- #define AES_ADDR_KEY5 (AES_ADDR_BASE + 0x15)
- #define AES_ADDR_KEY6 (AES_ADDR_BASE + 0x16)
- #define AES_ADDR_KEY7 (AES_ADDR_BASE + 0x17)
-
- #define AES_ADDR_BLOCK0 (AES_ADDR_BASE + 0x20)
- #define AES_ADDR_BLOCK1 (AES_ADDR_BASE + 0x21)
- #define AES_ADDR_BLOCK2 (AES_ADDR_BASE + 0x22)
- #define AES_ADDR_BLOCK3 (AES_ADDR_BASE + 0x23)
-
- #define AES_ADDR_RESULT0 (AES_ADDR_BASE + 0x30)
- #define AES_ADDR_RESULT1 (AES_ADDR_BASE + 0x31)
- #define AES_ADDR_RESULT2 (AES_ADDR_BASE + 0x32)
- #define AES_ADDR_RESULT3 (AES_ADDR_BASE + 0x33)
-
- /* Current name and version values */
- #define AES_CORE_NAME0 "aes "
- #define AES_CORE_NAME1 " "
+ #define AES_CORE_NAME "aes "
#define AES_CORE_VERSION "0.80"
-
- /* Chacha core */
- #define CHACHA_ADDR_BASE (SEGMENT_OFFSET_CIPHERS + (1 * CORE_SIZE))
- #define CHACHA_ADDR_NAME0 (CHACHA_ADDR_BASE + ADDR_NAME0)
- #define CHACHA_ADDR_NAME1 (CHACHA_ADDR_BASE + ADDR_NAME1)
- #define CHACHA_ADDR_VERSION (CHACHA_ADDR_BASE + ADDR_VERSION)
- #define CHACHA_ADDR_CTRL (CHACHA_ADDR_BASE + ADDR_CTRL)
- #define CHACHA_ADDR_STATUS (CHACHA_ADDR_BASE + ADDR_STATUS)
-
- #define CHACHA_ADDR_KEYLEN (CHACHA_ADDR_BASE + 0x0a)
- #define CHACHA_KEYLEN (1)
-
- #define CHACHA_ADDR_ROUNDS (CHACHA_ADDR_BASE + 0x0b)
-
- #define CHACHA_ADDR_KEY0 (CHACHA_ADDR_BASE + 0x10)
- #define CHACHA_ADDR_KEY1 (CHACHA_ADDR_BASE + 0x11)
- #define CHACHA_ADDR_KEY2 (CHACHA_ADDR_BASE + 0x12)
- #define CHACHA_ADDR_KEY3 (CHACHA_ADDR_BASE + 0x13)
- #define CHACHA_ADDR_KEY4 (CHACHA_ADDR_BASE + 0x14)
- #define CHACHA_ADDR_KEY5 (CHACHA_ADDR_BASE + 0x15)
- #define CHACHA_ADDR_KEY6 (CHACHA_ADDR_BASE + 0x16)
- #define CHACHA_ADDR_KEY7 (CHACHA_ADDR_BASE + 0x17)
-
- #define CHACHA_ADDR_IV0 (CHACHA_ADDR_BASE + 0x20)
- #define CHACHA_ADDR_IV1 (CHACHA_ADDR_BASE + 0x21)
-
- #define CHACHA_ADDR_DATA_IN0 (CHACHA_ADDR_BASE + 0x40)
- #define CHACHA_ADDR_DATA_IN1 (CHACHA_ADDR_BASE + 0x41)
- #define CHACHA_ADDR_DATA_IN2 (CHACHA_ADDR_BASE + 0x42)
- #define CHACHA_ADDR_DATA_IN3 (CHACHA_ADDR_BASE + 0x43)
- #define CHACHA_ADDR_DATA_IN4 (CHACHA_ADDR_BASE + 0x44)
- #define CHACHA_ADDR_DATA_IN5 (CHACHA_ADDR_BASE + 0x45)
- #define CHACHA_ADDR_DATA_IN6 (CHACHA_ADDR_BASE + 0x46)
- #define CHACHA_ADDR_DATA_IN7 (CHACHA_ADDR_BASE + 0x47)
- #define CHACHA_ADDR_DATA_IN8 (CHACHA_ADDR_BASE + 0x48)
- #define CHACHA_ADDR_DATA_IN9 (CHACHA_ADDR_BASE + 0x49)
- #define CHACHA_ADDR_DATA_IN10 (CHACHA_ADDR_BASE + 0x4a)
- #define CHACHA_ADDR_DATA_IN11 (CHACHA_ADDR_BASE + 0x4b)
- #define CHACHA_ADDR_DATA_IN12 (CHACHA_ADDR_BASE + 0x4c)
- #define CHACHA_ADDR_DATA_IN13 (CHACHA_ADDR_BASE + 0x4d)
- #define CHACHA_ADDR_DATA_IN14 (CHACHA_ADDR_BASE + 0x4e)
- #define CHACHA_ADDR_DATA_IN15 (CHACHA_ADDR_BASE + 0x4f)
-
- #define CHACHA_ADDR_DATA_OUT0 (CHACHA_ADDR_BASE + 0x80)
- #define CHACHA_ADDR_DATA_OUT1 (CHACHA_ADDR_BASE + 0x81)
- #define CHACHA_ADDR_DATA_OUT2 (CHACHA_ADDR_BASE + 0x82)
- #define CHACHA_ADDR_DATA_OUT3 (CHACHA_ADDR_BASE + 0x83)
- #define CHACHA_ADDR_DATA_OUT4 (CHACHA_ADDR_BASE + 0x84)
- #define CHACHA_ADDR_DATA_OUT5 (CHACHA_ADDR_BASE + 0x85)
- #define CHACHA_ADDR_DATA_OUT6 (CHACHA_ADDR_BASE + 0x86)
- #define CHACHA_ADDR_DATA_OUT7 (CHACHA_ADDR_BASE + 0x87)
- #define CHACHA_ADDR_DATA_OUT8 (CHACHA_ADDR_BASE + 0x88)
- #define CHACHA_ADDR_DATA_OUT9 (CHACHA_ADDR_BASE + 0x89)
- #define CHACHA_ADDR_DATA_OUT10 (CHACHA_ADDR_BASE + 0x8a)
- #define CHACHA_ADDR_DATA_OUT11 (CHACHA_ADDR_BASE + 0x8b)
- #define CHACHA_ADDR_DATA_OUT12 (CHACHA_ADDR_BASE + 0x8c)
- #define CHACHA_ADDR_DATA_OUT13 (CHACHA_ADDR_BASE + 0x8d)
- #define CHACHA_ADDR_DATA_OUT14 (CHACHA_ADDR_BASE + 0x8e)
- #define CHACHA_ADDR_DATA_OUT15 (CHACHA_ADDR_BASE + 0x8f)
-
- /* Current name and version values */
- #define CHACHA_NAME0 "chac"
- #define CHACHA_NAME1 "ha "
+ #define CHACHA_NAME "chacha "
#define CHACHA_VERSION "0.80"
-
- /*
- * MATH segment.
- */
-
- #define MATH_CORE_SIZE (0x400)
-
- /*
- * ModExpS6 core. MODEXPS6_OPERAND_BITS is size in bits of largest
- * supported modulus.
- */
-
- #define MODEXPS6_ADDR_BASE (SEGMENT_OFFSET_MATH + (0x00 * MATH_CORE_SIZE))
- #define MODEXPS6_OPERAND_BITS (4096)
- #define MODEXPS6_OPERAND_WORDS (MODEXPS6_OPERAND_BITS/32)
- #define MODEXPS6_ADDR_REGISTERS (MODEXPS6_ADDR_BASE + 0*MODEXPS6_OPERAND_WORDS)
- #define MODEXPS6_ADDR_OPERANDS (MODEXPS6_ADDR_BASE + 4*MODEXPS6_OPERAND_WORDS)
- #define MODEXPS6_ADDR_NAME0 (MODEXPS6_ADDR_REGISTERS + ADDR_NAME0)
- #define MODEXPS6_ADDR_NAME1 (MODEXPS6_ADDR_REGISTERS + ADDR_NAME1)
- #define MODEXPS6_ADDR_VERSION (MODEXPS6_ADDR_REGISTERS + ADDR_VERSION)
- #define MODEXPS6_ADDR_CTRL (MODEXPS6_ADDR_REGISTERS + ADDR_CTRL)
- #define MODEXPS6_ADDR_STATUS (MODEXPS6_ADDR_REGISTERS + ADDR_STATUS)
- #define MODEXPS6_ADDR_MODE (MODEXPS6_ADDR_REGISTERS + 0x10)
- #define MODEXPS6_ADDR_MODULUS_WIDTH (MODEXPS6_ADDR_REGISTERS + 0x11)
- #define MODEXPS6_ADDR_EXPONENT_WIDTH (MODEXPS6_ADDR_REGISTERS + 0x12)
- #define MODEXPS6_ADDR_MODULUS (MODEXPS6_ADDR_OPERANDS + 0*MODEXPS6_OPERAND_WORDS)
- #define MODEXPS6_ADDR_MESSAGE (MODEXPS6_ADDR_OPERANDS + 1*MODEXPS6_OPERAND_WORDS)
- #define MODEXPS6_ADDR_EXPONENT (MODEXPS6_ADDR_OPERANDS + 2*MODEXPS6_OPERAND_WORDS)
- #define MODEXPS6_ADDR_RESULT (MODEXPS6_ADDR_OPERANDS + 3*MODEXPS6_OPERAND_WORDS)
- #define MODEXPS6_NAME0 "mode"
- #define MODEXPS6_NAME1 "xps6"
- #define MODEXPS6_VERSION "0.10"
+ #define MODEXPS6_NAME "modexps6"
+ #define MODEXPS6_VERSION "0.10"
/*
* C API error codes. Defined in this form so we can keep the tokens
diff --cc hash.c
index 52dbbf0,5316a2d..0ba6b50
--- a/hash.c
+++ b/hash.c
@@@ -37,8 -37,13 +37,9 @@@
#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
#include "hal.h"
+ #include "verilog_constants.h"
/*
* HMAC magic numbers.
diff --cc pbkdf2.c
index 1c43fe4,def5067..85273f0
--- a/pbkdf2.c
+++ b/pbkdf2.c
@@@ -34,9 -34,16 +34,10 @@@
#include <assert.h>
#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
#include <stdint.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/ioctl.h>
#include "hal.h"
+ #include "verilog_constants.h"
/*
* Utility to encapsulate the HMAC operations. May need refactoring
More information about the Commits
mailing list