Skip to content
This repository was archived by the owner on Nov 18, 2022. It is now read-only.

Commit 093e918

Browse files
committed
Merge branch 'libcryptoauth' into temp
2 parents e50d0de + 40abcae commit 093e918

File tree

15 files changed

+171
-1486
lines changed

15 files changed

+171
-1486
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ compiler:
33
- gcc
44
- clang
55
# Change this to your needs
6-
before_install: sudo apt-get install texinfo guile-1.8 guile-1.8-dev
7-
script: ./autogen.sh
6+
before_install: sudo apt-get install texinfo libxml2-dev check
7+
script: ./autogen.sh

Makefile.am

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,11 @@ SUBDIRS = doc .
2626
AM_YFLAGS = -d
2727

2828
bin_PROGRAMS = eclet
29-
eclet_SOURCES = src/driver/command.h src/driver/command.c \
30-
src/driver/defs.h \
31-
src/cli/main.c \
32-
src/driver/personalize.h src/driver/personalize.c \
33-
src/cli/cli_commands.h src/cli/cli_commands.c \
34-
src/driver/config_zone.h src/driver/config_zone.c
29+
eclet_SOURCES = src/driver/defs.h \
30+
src/cli/main.c \
31+
src/driver/personalize.h src/driver/personalize.c \
32+
src/cli/cli_commands.h src/cli/cli_commands.c \
33+
src/driver/config_zone.h src/driver/config_zone.c
3534

3635
eclet_CFLAGS = -Wall
3736

README.md

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ EClet
22
=====
33

44
[![Build Status](https://travis-ci.org/cryptotronix/EClet.png)](https://travis-ci.org/cryptotronix/EClet)
5+
<a href="https://scan.coverity.com/projects/4781">
6+
<img alt="Coverity Scan Build Status"
7+
src="https://scan.coverity.com/projects/4781/badge.svg"/>
8+
</a>
59

610
Driver for the Cryptotronix EClet containing an Atmel ATECC108
711

812
Status
913
---
1014

11-
This software is in ***ALPHA***. I have tested the below commands, but some there are some features and documentation that I would like to finish. If you use this software, it will configure your ECC108 in a non-reversible way. It will allow you to sign and verify with P256 keys but future features may be incompatible.
15+
This software is in ***BETA***. I have tested the below commands, but some there are some features and documentation that I would like to finish. If you use this software, it will configure your ECC108 in a non-reversible way. It will allow you to sign and verify with P256 keys but future features may be incompatible.
1216

1317
You can following along with the release status [here](https://github.com/cryptotronix/EClet/issues?milestone=1&state=open).
1418

@@ -17,7 +21,7 @@ Building
1721

1822
This project uses Autotools.
1923

20-
It requires [libcrypti2c](https://github.com/cryptotronix/libcrypti2c), also in ***ALPHA***. If you use the [autogen](https://github.com/cryptotronix/EClet/blob/master/autogen.sh) script, it will automatically build and install the library.
24+
It requires [libcryptoauth-0.2](https://github.com/cryptotronix/libcrypti2c), also in ***ALPHA***. If you use the [autogen](https://github.com/cryptotronix/EClet/blob/master/autogen.sh) script, it will automatically build and install the library.
2125

2226
Hardware
2327
---
@@ -27,7 +31,16 @@ Product page will be available shortly. This software will also work on the [Cry
2731
Running
2832
---
2933

30-
see `./eclet --help` for full details. The default I2C bus is `/dev/i2c-1` and this can be changed with the `-b` option.
34+
see `./eclet --help` for full details. The default I2C bus is
35+
`/dev/i2c-1` and this can be changed with the `-b` option.
36+
37+
Kernel option
38+
---
39+
40+
If you build
41+
[libcryptoauth](https://github.com/cryptotronix/libcrypti2c) with the
42+
`-DUSE_KERNEL` flag and install the kernel module, this utility will
43+
use that module if you pass in: `-b /dev/atsha0`.
3144

3245
Root
3346
---
@@ -116,9 +129,4 @@ IRC: Join the `#cryptotronix` channel on freenode.
116129

117130
Mailing lists: `hashlet-announce` and `hashlet-users` are open for subscriptions [here](https://savannah.nongnu.org/mail/?group=hashlet).
118131

119-
Contributing
120-
---
121-
See the wiki page on [contributing](https://github.com/cryptotronix/hashlet/wiki/Contributing).
122-
123-
124132
![GPLv3](https://www.gnu.org/graphics/gplv3-127x51.png)

autogen.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ if [ ! -d "m4" ]; then
2020
mkdir m4
2121
fi
2222

23-
pkg-config --exists crypti2c-0.1
23+
pkg-config --exists cryptoauth-0.2
2424
HAVE_CRYPTI2C=$?
2525

2626
if [ $HAVE_CRYPTI2C -eq 0 ]; then
27-
echo libcrypti2c already installed
27+
echo libcryptoauth already installed
2828
else
29-
git clone https://github.com/cryptotronix/libcrypti2c.git
30-
cd libcrypti2c
31-
./autogen.sh
29+
wget https://github.com/cryptotronix/libcrypti2c/releases/download/v0.2/libcryptoauth-0.2.tar.gz
30+
tar xf libcryptoauth-0.2.tar.gz
31+
cd libcryptoauth-0.2
32+
./configure
33+
make
3234
echo Enter password to install libcrypti2c library
3335
sudo make install
3436
cd ..

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# You should have received a copy of the GNU General Public License
1616
# along with EClet. If not, see <http://www.gnu.org/licenses/>.
1717

18-
AC_INIT([eclet], [0.0.1], [bugs@cryptotronix.com], [eclet], [http://www.github.com/cryptotronix/EClet/])
18+
AC_INIT([eclet], [0.1.0], [bugs@cryptotronix.com], [eclet], [http://www.github.com/cryptotronix/EClet/])
1919
AC_PREREQ([2.59])
2020
AM_INIT_AUTOMAKE([1.10 -Wall no-define])
2121
AC_CONFIG_MACRO_DIR([m4])
@@ -25,7 +25,7 @@ AC_PROG_CC
2525
AM_PROG_CC_C_O
2626
AC_CONFIG_FILES([Makefile doc/Makefile])
2727
PKG_PROG_PKG_CONFIG
28-
PKG_CHECK_MODULES([DEPS], [crypti2c-0.1])
28+
PKG_CHECK_MODULES([DEPS], [cryptoauth-0.2])
2929
AC_PROG_LIBTOOL
3030

3131

0 commit comments

Comments
 (0)