diff options
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | aes_keywrap.c | 2 | ||||
| -rw-r--r-- | csprng.c | 2 | ||||
| -rw-r--r-- | errorstrings.c | 2 | ||||
| -rw-r--r-- | hal.h (renamed from cryptech.h) | 8 | ||||
| -rw-r--r-- | hal_io_eim.c | 2 | ||||
| -rw-r--r-- | hal_io_i2c.c | 2 | ||||
| -rw-r--r-- | hash.c | 2 | ||||
| -rw-r--r-- | modexp.c | 2 | ||||
| -rw-r--r-- | pbkdf2.c | 2 | ||||
| -rw-r--r-- | rsa.c | 2 | ||||
| -rw-r--r-- | tests/Makefile.in | 4 | ||||
| -rw-r--r-- | tests/test-aes-key-wrap.c | 2 | ||||
| -rw-r--r-- | tests/test-hash.c | 2 | ||||
| -rw-r--r-- | tests/test-pbkdf2.c | 2 | ||||
| -rw-r--r-- | tests/test-rsa.c | 3 |
16 files changed, 22 insertions, 21 deletions
diff --git a/Makefile.in b/Makefile.in index b28cec8..c6cca31 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,8 +27,8 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -INC = cryptech.h -LIB = libcryptech.a +INC = hal.h +LIB = libhal.a OBJ = ${IO_OBJ} csprng.o hash.o aes_keywrap.o pbkdf2.o \ modexp.o rsa.o errorstrings.o diff --git a/aes_keywrap.c b/aes_keywrap.c index a68164c..7b90c9d 100644 --- a/aes_keywrap.c +++ b/aes_keywrap.c @@ -47,7 +47,7 @@ #include <string.h> #include <assert.h> -#include "cryptech.h" +#include "hal.h" /* * How long the ciphertext will be for a given plaintext length. @@ -37,7 +37,7 @@ #include <stddef.h> #include <stdio.h> -#include "cryptech.h" +#include "hal.h" #ifndef WAIT_FOR_CSPRNG_VALID #define WAIT_FOR_CSPRNG_VALID 0 diff --git a/errorstrings.c b/errorstrings.c index 9a4cc49..1a234dd 100644 --- a/errorstrings.c +++ b/errorstrings.c @@ -38,7 +38,7 @@ #include <string.h> #include <assert.h> -#include "cryptech.h" +#include "hal.h" #define DEFINE_HAL_ERROR(_code_,_text_) \ case _code_: return _text_; @@ -1,5 +1,5 @@ /* - * cryptech.h + * hal.h * ---------- * Memory map, access functions, and HAL for Cryptech cores. * @@ -60,8 +60,8 @@ * in order to map it into a 16-bit address space. */ -#ifndef _CRYPTECH_H_ -#define _CRYPTECH_H_ +#ifndef _HAL_H_ +#define _HAL_H_ /* @@ -664,7 +664,7 @@ extern hal_error_t hal_rsa_key_from_der(hal_rsa_key_t *key, void *keybuf, const size_t keybuf_len, const uint8_t * const der, const size_t der_len); -#endif /* _CRYPTECH_H_ */ +#endif /* _HAL_H_ */ /* * Local variables: diff --git a/hal_io_eim.c b/hal_io_eim.c index f7444e2..bdc3171 100644 --- a/hal_io_eim.c +++ b/hal_io_eim.c @@ -42,7 +42,7 @@ #include <arpa/inet.h> #include "novena-eim.h" -#include "cryptech.h" +#include "hal.h" static int debug = 0; static int inited = 0; diff --git a/hal_io_i2c.c b/hal_io_i2c.c index aa7b198..c98ea7d 100644 --- a/hal_io_i2c.c +++ b/hal_io_i2c.c @@ -40,7 +40,7 @@ #include <sys/ioctl.h> #include <stdint.h> -#include "cryptech.h" +#include "hal.h" #define I2C_dev "/dev/i2c-2" #define I2C_addr 0x0f @@ -42,7 +42,7 @@ #include <unistd.h> #include <sys/ioctl.h> -#include "cryptech.h" +#include "hal.h" /* * HMAC magic numbers. @@ -45,7 +45,7 @@ #include <string.h> #include <assert.h> -#include "cryptech.h" +#include "hal.h" /* * Whether we want debug output. @@ -42,7 +42,7 @@ #include <unistd.h> #include <sys/ioctl.h> -#include "cryptech.h" +#include "hal.h" /* * Utility to encapsulate the HMAC operations. May need refactoring @@ -47,7 +47,7 @@ #include <string.h> #include <assert.h> -#include "cryptech.h" +#include "hal.h" /* * Whether to use ModExp core. It works, but at the moment it's so diff --git a/tests/Makefile.in b/tests/Makefile.in index b5801d9..0a98792 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -27,8 +27,8 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -INC = ../cryptech.h -LIB = ../libcryptech.a +INC = ../hal.h +LIB = ../libhal.a BIN = test-aes-key-wrap test-hash test-pbkdf2 test-rsa CC = @CC@ diff --git a/tests/test-aes-key-wrap.c b/tests/test-aes-key-wrap.c index cebdcc7..f8467ec 100644 --- a/tests/test-aes-key-wrap.c +++ b/tests/test-aes-key-wrap.c @@ -38,7 +38,7 @@ #include <string.h> #include <assert.h> -#include <cryptech.h> +#include <hal.h> #ifndef TC_BUFSIZE #define TC_BUFSIZE 4096 diff --git a/tests/test-hash.c b/tests/test-hash.c index d5a5a14..befdf02 100644 --- a/tests/test-hash.c +++ b/tests/test-hash.c @@ -38,7 +38,7 @@ #include <string.h> #include <assert.h> -#include <cryptech.h> +#include <hal.h> /* Usual NIST sample messages. */ diff --git a/tests/test-pbkdf2.c b/tests/test-pbkdf2.c index 5403612..469b599 100644 --- a/tests/test-pbkdf2.c +++ b/tests/test-pbkdf2.c @@ -42,7 +42,7 @@ #include <unistd.h> #include <sys/ioctl.h> -#include "cryptech.h" +#include <hal.h> /* PBKDF2 HMAC-SHA-1 test cases from RFC 6070. */ diff --git a/tests/test-rsa.c b/tests/test-rsa.c index 03ea8bb..fb53f69 100644 --- a/tests/test-rsa.c +++ b/tests/test-rsa.c @@ -47,7 +47,8 @@ #include <sys/time.h> -#include "cryptech.h" +#include <hal.h> + #include "test-rsa.h" /* |