Skip to content

Commit 0676c9a

Browse files
sjaeckelsjaeckel
committed
Merge branch 'release/1.18.0'
2 parents bbc52b9 + c165f3a commit 0676c9a

File tree

554 files changed

+89979
-19313
lines changed

Some content is hidden

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

554 files changed

+89979
-19313
lines changed

‎.clang-format‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
---
2+
AccessModifierOffset: -2
3+
ConstructorInitializerIndentWidth: 4
4+
AlignEscapedNewlinesLeft: false
5+
AlignTrailingComments: true
6+
AllowAllParametersOfDeclarationOnNextLine: false
7+
AllowShortIfStatementsOnASingleLine: false
8+
AllowShortLoopsOnASingleLine: false
9+
AlwaysBreakTemplateDeclarations: false
10+
AlwaysBreakBeforeMultilineStrings: false
11+
BreakBeforeBinaryOperators: false
12+
BreakConstructorInitializersBeforeComma: false
13+
BinPackParameters: true
14+
ColumnLimit: 120
15+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
16+
DerivePointerBinding: true
17+
ExperimentalAutoDetectBinPacking: false
18+
IndentCaseLabels: true
19+
MaxEmptyLinesToKeep: 1
20+
NamespaceIndentation: None
21+
ObjCSpaceBeforeProtocolList: false
22+
PenaltyBreakComment: 60
23+
PenaltyBreakString: 1000
24+
PenaltyBreakFirstLessLess: 120
25+
PenaltyExcessCharacter: 1000000
26+
PenaltyReturnTypeOnItsOwnLine: 200
27+
PointerBindsToType: false
28+
SpacesBeforeTrailingComments: 1
29+
Cpp11BracedListStyle: false
30+
Standard: Cpp03
31+
IndentWidth: 3
32+
TabWidth: 8
33+
UseTab: Never
34+
BreakBeforeBraces: Linux
35+
IndentFunctionDeclarationAfterType: false
36+
SpacesInParentheses: false
37+
SpaceInEmptyParentheses: false
38+
SpacesInCStyleCastParentheses: false
39+
SpaceAfterControlStatementKeyword: true
40+
SpaceBeforeAssignmentOperators: true
41+
...
42+

‎.gitattributes‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
/.gitattributes export-ignore
2+
/.gitignore export-ignore
3+
4+
/** export-subst

‎.gitignore‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# suppress compiler/linker output
2+
*.[oa]
3+
*.obj
4+
*.l[oa]
5+
[Dd]ebug/
6+
[Rr]elease/
7+
/MSVC_*
8+
.libs/
9+
10+
# release files
11+
/libtomcrypt-*
12+
/crypt-*
13+
14+
# suppress output of build process
15+
gcc_[12].txt
16+
testok.txt
17+
test_*.txt
18+
tv.txt
19+
*_tv.txt
20+
doxygen/
21+
doc/crypt.pdf
22+
doc/refman.pdf
23+
24+
# *nix/windows test executables
25+
constants
26+
constants.exe
27+
ltcrypt
28+
ltcrypt.exe
29+
hashsum
30+
hashsum.exe
31+
multi
32+
multi.exe
33+
openssl-enc
34+
openssl-enc.exe
35+
sizes
36+
sizes.exe
37+
small
38+
small.exe
39+
test
40+
test.exe
41+
tv_gen
42+
tv_gen.exe
43+
timing
44+
timing.exe
45+
46+
# Visual Studio special files
47+
# ignore user specific settings
48+
*.user
49+
*.suo
50+
# ignore non-compressed browse file (holds information for ClassView, IntelliSense and WizardBar)
51+
*.ncb
52+
# ignore VS intermediate and program database files
53+
*.idb
54+
*.pdb
55+
56+
# Eclipse special files
57+
.project
58+
.cproject
59+
.settings/
60+
61+
# oops ;) but we don't want them to appear in the repository...
62+
*.stackdump
63+
*.core
64+
65+
# misc
66+
*.rej
67+
*.patch
68+
*.diff
69+
*.orig
70+
*.out
71+
*.ll
72+
*.gcda
73+
*.gcno
74+
*.gcov
75+
libtomcrypt.pc
76+
77+
# output from doc generation
78+
doxygen/
79+
*.dvi
80+
*.log
81+
*.aux
82+
*.toc
83+
*.idx
84+
*.ilg
85+
*.ind
86+
*.out
87+
*.lof
88+
*.bak
89+
90+
coverage/
91+
coverage*.info
92+
93+
# coverity intermediate directory etc.
94+
cov-int/
95+
.coverity_*
96+
libtomcrypt.lzma

‎.travis.yml‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
dist: trusty
2+
sudo: required
3+
4+
language: c
5+
6+
addons:
7+
apt:
8+
sources:
9+
- ubuntu-toolchain-r-test
10+
- llvm-toolchain-precise-3.8
11+
packages:
12+
- clang-3.8
13+
14+
install:
15+
- sudo apt-get update -qq
16+
- sudo apt-get install libtommath-dev
17+
18+
before_script:
19+
- gem install coveralls-lcov
20+
- curl http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz | tar xz
21+
- export PATH=$PATH:`pwd`/lcov-1.11/bin
22+
- curl -s https://packagecloud.io/install/repositories/libtom/packages/script.deb.sh | sudo bash
23+
- sudo apt-get install libtfm-dev=0.13-5
24+
25+
matrix:
26+
fast_finish: true
27+
branches:
28+
only:
29+
- master
30+
- develop
31+
- /^release\/.*$/
32+
33+
compiler:
34+
- gcc
35+
- clang
36+
script:
37+
- bash "${BUILDSCRIPT}" "${BUILDNAME}" "${BUILDOPTIONS}" "makefile V=1" "-DUSE_LTM -DLTM_DESC" "-ltommath"
38+
- bash "${BUILDSCRIPT}" "${BUILDNAME}" "${BUILDOPTIONS}" "makefile.shared V=1" "-DUSE_TFM -DTFM_DESC" "-ltfm"
39+
env:
40+
- |
41+
BUILDSCRIPT="check_source.sh"
42+
BUILDNAME="CHECK_SOURCES"
43+
BUILDOPTIONS=" "
44+
- |
45+
BUILDSCRIPT="scan_build.sh"
46+
BUILDNAME="SCAN_BUILD"
47+
BUILDOPTIONS=" "
48+
- |
49+
BUILDSCRIPT="coverage.sh"
50+
BUILDNAME="COVERAGE"
51+
BUILDOPTIONS=" "
52+
- |
53+
BUILDSCRIPT="run.sh"
54+
BUILDNAME="STOCK"
55+
BUILDOPTIONS=" "
56+
- |
57+
BUILDSCRIPT="run.sh"
58+
BUILDNAME="EASY"
59+
BUILDOPTIONS="-DLTC_EASY"
60+
- |
61+
BUILDSCRIPT="run.sh"
62+
BUILDNAME="SMALL"
63+
BUILDOPTIONS="-DLTC_SMALL_CODE"
64+
- |
65+
BUILDSCRIPT="run.sh"
66+
BUILDNAME="NOTABLES"
67+
BUILDOPTIONS="-DLTC_NO_TABLES"
68+
- |
69+
BUILDSCRIPT="run.sh"
70+
BUILDNAME="SMALL+NOTABLES"
71+
BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_NO_TABLES"
72+
- |
73+
BUILDSCRIPT="run.sh"
74+
BUILDNAME="CLEANSTACK"
75+
BUILDOPTIONS="-DLTC_CLEAN_STACK"
76+
- |
77+
BUILDSCRIPT="run.sh"
78+
BUILDNAME="CLEANSTACK+SMALL"
79+
BUILDOPTIONS="-DLTC_SMALL_CODE -DLTC_CLEAN_STACK"
80+
- |
81+
BUILDSCRIPT="run.sh"
82+
BUILDNAME="CLEANSTACK+NOTABLES"
83+
BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK"
84+
- |
85+
BUILDSCRIPT="run.sh"
86+
BUILDNAME="CLEANSTACK+NOTABLES+SMALL"
87+
BUILDOPTIONS="-DLTC_NO_TABLES -DLTC_CLEAN_STACK -DLTC_SMALL_CODE"
88+
- |
89+
BUILDSCRIPT="run.sh"
90+
BUILDNAME="NO_FAST"
91+
BUILDOPTIONS="-DLTC_NO_FAST"
92+
- |
93+
BUILDSCRIPT="run.sh"
94+
BUILDNAME="NO_FAST+NOTABLES"
95+
BUILDOPTIONS="-DLTC_NO_FAST -DLTC_NO_TABLES"
96+
- |
97+
BUILDSCRIPT="run.sh"
98+
BUILDNAME="NO_ASM"
99+
BUILDOPTIONS="-DLTC_NO_ASM"
100+
- |
101+
BUILDSCRIPT="run.sh"
102+
BUILDNAME="NO_TIMING_RESISTANCE"
103+
BUILDOPTIONS="-DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING"
104+
- |
105+
BUILDSCRIPT="run.sh"
106+
BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE"
107+
BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING"
108+
- |
109+
BUILDSCRIPT="run.sh"
110+
BUILDNAME="PTHREAD"
111+
BUILDOPTIONS="-DLTC_PTHREAD"
112+
- |
113+
BUILDSCRIPT="run.sh"
114+
BUILDNAME="CLEANSTACK+NOTABLES+SMALL+NO_ASM+NO_TIMING_RESISTANCE+PTHREAD"
115+
BUILDOPTIONS="-DLTC_CLEAN_STACK -DLTC_NO_TABLES -DLTC_SMALL_CODE -DLTC_NO_ECC_TIMING_RESISTANT -DLTC_NO_RSA_BLINDING -DLTC_PTHREAD"
116+
- |
117+
BUILDSCRIPT="testbuild.sh"
118+
BUILDNAME="NOTEST"
119+
BUILDOPTIONS="-DLTC_NO_TEST"
120+
- |
121+
BUILDSCRIPT="testbuild.sh"
122+
BUILDNAME="NOFILE"
123+
BUILDOPTIONS="-DLTC_NO_FILE"
124+
125+
after_failure:
126+
- cat test_std.txt
127+
- cat test_err.txt
128+
- cat tv.txt
129+
130+
after_script:
131+
- cat gcc_1.txt
132+
- cat gcc_2.txt
133+
134+
notifications:
135+
irc: "chat.freenode.net#libtom-notifications"

0 commit comments

Comments
 (0)