Skip to content

Commit cb6c6b8

Browse files
committed
Merge branch 'devel'
2 parents 6c46a27 + c581e39 commit cb6c6b8

File tree

218 files changed

+10868
-2402
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+10868
-2402
lines changed

!uploader/ectester.cap

-15.6 KB
Binary file not shown.

!uploader/simpleECC_NXP_JCOP_CJ2A081.txt

-54
This file was deleted.

!uploader/simpleECC_test.txt

-27
This file was deleted.

!uploader/simpleECC_testDHSecret.txt

-23
This file was deleted.

!uploader/simpleECC_testECFull.txt

-12
This file was deleted.

!uploader/simpleECC_testSetParams.txt

-27
This file was deleted.

.gitignore

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Built artifacts in /dist and /applet.
2+
/dist/lib/
3+
/dist/ECTesterReader.jar
4+
/dist/ECTesterReader-dist.jar
5+
/dist/ectester-reader.sh
6+
/dist/ectester-reader.bat
7+
/dist/ECTesterStandalone.jar
8+
/dist/ECTesterStandalone-dist.jar
9+
/applet/ectester.cap
10+
11+
# Built binaries in /src.
12+
/src/**/*.a
13+
/src/**/*.o
14+
/src/**/*.so

.travis.yml

+22-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,33 @@
1+
addons:
2+
apt:
3+
sources:
4+
- ubuntu-toolchain-r-test
5+
packages:
6+
- libtomcrypt-dev
7+
- libtommath-dev
8+
- gcc-6
9+
- g++-6
110
language: java
211
jdk:
3-
- oraclejdk8
12+
- oraclejdk8
13+
env:
14+
- CC=gcc-6 CXX=g++-6
15+
416
script:
5-
- ant -f jcbuild.xml build
6-
- ant -f build.xml package
17+
- ant -f build-applet.xml build
18+
- ant -f build-reader.xml package
19+
- ant -f build-standalone.xml package
20+
721
deploy:
822
provider: releases
923
api_key:
1024
secure: q2aJvu32K+nfbMR60nFCEkn+jYCKprlCRlIoPjuRz1HySX233Ccwpx1CAdNzEjY6FDFcoReKAg6r5vdPjJ4FRPAQ23TxffIYZPkykL5K/pUZJbM5xkazJY0Fp8i6Vyl0JfeanVib1PTyOSugplhCttFk5nb9JUFV36Tre66XntOl5y80Trn94F5aTlRjfW26UH65W7Aa6WZ0N4OX/ZsX+vEOJPAu+RLfOq9oBOx/loB8ntYM/e/6bEwJp6EedRQLDsiS4NavP3svH+GXsPLs5p3soyRXYsvvGKVnVjcjZURxDDdxv5YuCWUUfl9PbNB+Mqmx/HQxl50BKoKFqwap1+TnlbuTAiWaXeh3zdXuGB+TPg8KE8h6ueDneHd3Lpivgq79IvPWIH+N4b3Pa952+rD+JKBZ807efB+97OtWrkQL7/sLZESQUdIszE724HHOiArKpNajIX+kN6NJdul5xFCiQQHG+O7iDFQBavCGM9fk63mZRyGPxZQzS06BV2vIIHg0yx3igN+OKKMFCH+P3hYR1zL6o65OlgbL1ifTZ18GDvmVRNdi53/fxQ2n/mQmI4tQpn4ZB7Ddoxx4GlpjFjzdKk/P9nKwng0M9wrp8row/vb5S+1aPwSxp9/4ASP9dkvLcNjTkWhmGPrWe+82Y9JPK47uesx0YeaVI2C7IR0=
1125
file:
12-
- "dist/ECTester-dist.jar"
13-
- "dist/ECTester.jar"
14-
- "!uploader/ectester.cap"
26+
- "dist/ECTesterReader-dist.jar"
27+
- "dist/ECTesterReader.jar"
28+
- "applet/ectester.cap"
29+
- "dist/ECTesterStandalone-dist.jar"
30+
- "dist/ECTesterStandalone.jar"
1531
skip_cleanup: true
1632
on:
1733
tags: true

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2016
3+
Copyright (c) 2016-2017
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)