Skip to content

Commit 1eeff0b

Browse files
Tom St Denissjaeckel
authored andcommitted
added libtomcrypt-1.08
1 parent 4a1a579 commit 1eeff0b

34 files changed

Lines changed: 750 additions & 183 deletions

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ PROJECT_NAME = LibTomCrypt
2323
# This could be handy for archiving the generated documentation or
2424
# if some version control system is used.
2525

26-
PROJECT_NUMBER = 1.07
26+
PROJECT_NUMBER = 1.08
2727

2828
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
2929
# base path where the generated documentation will be put.

TODO

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1 @@
1-
For 1.07
21

3-
4-
1. [3 hours] ASN.1 SET and T61String [punishment, add UTF8 to the list!]
5-
6-
4. [short] Make parameters in descriptors common, e.g. cipher.block_length => cipher.block_size, hash.blocksize => hash.block_size
7-
8-
DONE
9-
----
10-
11-
0. [important] Make ciphers enc/dec routines return int [for accel]. Make the ciphers themselves return CRYPT_OK [default] *AND* make
12-
all dependent code check the returns
13-
[x] gcm
14-
[x] ccm
15-
[x] yarrow
16-
[x] fortuna
17-
[x] eax
18-
[x] ocb
19-
[x] omac
20-
[x] pmac
21-
[x] pelican
22-
[x] ctr
23-
[x] cbc
24-
[x] ecb
25-
[x] cfb
26-
[x] ofb
27-
28-
2. [many] ASN.1 flexidecoder. Basically decode and construct a list of decoded ASN.1 types on the fly.
29-
This will allow easy decoding of things like X.509 as their orders can be "screwed up".
30-
The concept is simple, just read the ID byte and use a linked list. I'll do this after step #1.
31-
32-
3. [short] Make the cipher/hash accelerators return int [not void] to signal errors. Whoops
33-
34-
5. [short] Swap arguments of MGF1 around so hash_idx is first
35-
36-
6. [longish] Re-write parts of the ECC api, re-factor the code, convert to w-NAF, add FP support, add ecc point verifier
37-
38-
7. [shortish] Provide DH for the DSA code e.g. dsa_encrypt_key()
39-
40-
8. [worthit] Move the ECC code for point mul and what not as symbols that the TFM/LTM descriptors link in. Means a change to the hierarchy. This allows
41-
code that uses ECC plugins to simply ignore this code [e.g. save space]
42-
43-
9. [short] Document the flexi decoder and how it relates to the other DER routines

changes

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
November 24th, 2005
2+
v1.08 -- Added SET and SET OF support to the ASN.1 side
3+
-- Fixed up X macros, added QSORT to the mix [thanks SET/SETOF]
4+
-- Added XMEMCMP to the list of X macros
5+
-- In der_decode_sequence() the SHORT_INTEGER type was not being handled correctly [oddly enough it worked just enough to make RSA work ... go figure!]
6+
-- Fixed bug in math descriptors where if you hadn't defined MECC (ECC support) you would get linker errors
7+
-- Added RSA accelerators to the math descriptors to make it possible to not include the stock routines if you supply your own.
8+
-- dsa_decrypt_key() was erroneously dependent on MECC not MDSA ... whoops
9+
-- Moved DSA size limits to tomcrypt_pk.h so they're defined with LTC_NO_PK+MDSA
10+
-- cleaned up tomcrypt_custom.h to make customizable PK easier (and also cleaned up the error traps so they're correctly reported)
11+
112
November 18th, 2005
213
v1.07 -- Craig Schlenter pointed out the "encrypt" demo doesn't call ctr_start() correctly. That's because as of a few releases ago
314
I added support to set the mode of the counter at init time
@@ -1383,6 +1394,6 @@ v0.02 -- Changed RC5 to only allow 12 to 24 rounds
13831394
v0.01 -- We will call this the first version.
13841395

13851396
/* $Source: /cvs/libtom/libtomcrypt/changes,v $ */
1386-
/* $Revision: 1.151 $ */
1387-
/* $Date: 2005/11/17 22:04:00 $ */
1397+
/* $Revision: 1.161 $ */
1398+
/* $Date: 2005/11/24 03:30:18 $ */
13881399

crypt.tex

Lines changed: 71 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
\def\gap{\vspace{0.5ex}}
4848
\makeindex
4949
\begin{document}
50-
\title{LibTomCrypt \\ Version 1.07}
50+
\title{LibTomCrypt \\ Version 1.08}
5151
\author{Tom St Denis \\
5252
\\
5353
tomstdenis@gmail.com \\
@@ -3198,7 +3198,7 @@ \section{ASN.1 Formats}
31983198
are all provided with three basic functions with \textit{similar} prototypes. One function has been dedicated to calculate the length in octets of a given
31993199
format and two functions have been dedicated to encoding and decoding the format.
32003200
3201-
On top of the basic data types are the SEQUENCE and\footnote{Planned for LTC 1.06} SET data types which are collections of other ASN.1 types. They are provided
3201+
On top of the basic data types are the SEQUENCE and SET data types which are collections of other ASN.1 types. They are provided
32023202
in the same manner as the other data types except they use list of objects known as the \textbf{ltc\_asn1\_list} structure. It is defined as
32033203
32043204
\index{ltc\_asn1\_list structure}
@@ -3262,7 +3262,9 @@ \section{ASN.1 Formats}
32623262
\hline LTC\_ASN1\_IA5\_STRING & IA5 STRING (one octet per char) \\
32633263
\hline LTC\_ASN1\_PRINTABLE\_STRING & PRINTABLE STIRNG (one octet per char) \\
32643264
\hline LTC\_ASN1\_UTCTIME & UTCTIME (see ltc\_utctime structure) \\
3265-
\hline LTC\_ASN1\_SEQUENCE & SEQUENCE OF \\
3265+
\hline LTC\_ASN1\_SEQUENCE & SEQUENCE (and SEQUENCE OF) \\
3266+
\hline LTC\_ASN1\_SET & SET \\
3267+
\hline LTC\_ASN1\_SETOF & SET OF \\
32663268
\hline LTC\_ASN1\_CHOICE & CHOICE \\
32673269
\hline
32683270
\end{tabular}
@@ -3347,6 +3349,68 @@ \subsubsection{SEQUENCE Multiple Argument Lists}
33473349
It's ideal that you cast the ``size'' values to unsigned long to ensure that the proper data type is passed to the function. Constants such as ``1'' without
33483350
a cast or prototype are of type \textbf{int} by default. Appending \textit{UL} or prepending \textit{(unsigned long)} is enough to cast it to the correct type.
33493351
3352+
\subsection{SET and SET OF}
3353+
3354+
\index{SET} \index{SET OF}
3355+
SET and SET OF are related to the SEQUENCE type in that they can be pretty much be decoded with the same code. However, they are different and they should
3356+
be carefully noted. The SET type is an unordered array of ASN.1 types sorted by the TAG (type identifier) whereas the SET OF type is an ordered array of
3357+
a \textbf{single} ASN.1 object sorted in ascending order by the DER their respective encodings.
3358+
3359+
\subsubsection{SET Encoding}
3360+
3361+
SETs use the same array structure of ltc\_asn1\_list that the SEQUENCE functions use. They are encoded with the following function.
3362+
3363+
\index{der\_encode\_set()}
3364+
\begin{verbatim}
3365+
int der_encode_set(ltc_asn1_list *list, unsigned long inlen,
3366+
unsigned char *out, unsigned long *outlen);
3367+
\end{verbatim}
3368+
3369+
This will encode the list of ASN.1 objects in ``list'' of length ``inlen'' objects and store the output in ``out'' of length ``outlen'' bytes. The function
3370+
will make a copy of the list provided and sort it by the TAG. Objects with identical TAGs are additionally sorted on their original placement in the
3371+
array (to make the process deterministic).
3372+
3373+
This function will \textbf{NOT} recognize ``DEFAULT'' objects and it is the responsibility of the caller to remove them as required.
3374+
3375+
\subsubsection{SET Decoding}
3376+
3377+
The SET type can be decoded with the following function.
3378+
3379+
\index{der\_decode\_set()}
3380+
\begin{verbatim}
3381+
int der_decode_set(const unsigned char *in, unsigned long inlen,
3382+
ltc_asn1_list *list, unsigned long outlen);
3383+
\end{verbatim}
3384+
3385+
This will decode the SET specified by ``list'' of length ``outlen'' objects from the input buffer ``in'' of length ``inlen'' octets.
3386+
3387+
It handles the fact that SETs are not strictly ordered and will make multiple passes (as required) through the list to decode all the objects.
3388+
3389+
\subsubsection{SET Length}
3390+
The length of a SET can be determined by calling der\_length\_sequence() since they have the same encoding length.
3391+
3392+
\subsubsection{SET OF Encoding}
3393+
A ``SET OF'' object is an array of identifical objects (e.g. OCTET STRING) sorted in ascending order by the DER encoding of the object. They are
3394+
used to store objects deterministically based solely on their encoding. It uses the same array structure of ltc\_asn1\_list that the SEQUENCE functions
3395+
use. They are encoded with the following function.
3396+
3397+
\index{der\_encode\_setof()}
3398+
\begin{verbatim}
3399+
int der_encode_setof(ltc_asn1_list *list, unsigned long inlen,
3400+
unsigned char *out, unsigned long *outlen);
3401+
\end{verbatim}
3402+
3403+
This will encode a ``SET OF'' containing the ``list'' of ``inlen'' ASN.1 objects and store the encoding in the output buffer ``out'' of length ``outlen''.
3404+
3405+
The routine will first encode the SET OF in an unordered fashion (in a temporary buffer) then sort using the XQSORT macro and copy back to the output buffer. This
3406+
means you need at least enough memory to keep an additional copy of the output on the heap.
3407+
3408+
\subsubsection{SET OF Decoding}
3409+
Since the decoding of a ``SET OF'' object is unambiguous it can be decoded with der\_decode\_sequence().
3410+
3411+
\subsubsection{SET OF Length}
3412+
Like the SET type the der\_length\_sequence() function can be used to determine the length of a ``SET OF'' object.
3413+
33503414
\subsection{ASN.1 INTEGER}
33513415
33523416
To encode or decode INTEGER data types use the following functions.
@@ -3547,8 +3611,8 @@ \subsection{ASN.1 Flexi Decoder}
35473611
and ``child''. The list works as a ``doubly-linked list'' structure where decoded items at the same level are sibblings (using next and prev) and items
35483612
encoded in a SEQUENCE are stored as a child element.
35493613
3550-
When a SEQUENCE has been encountered a SEQUENCE item is added as a sibbling (e.g. list.type == LTC\_ASN1\_SEQUENCE) and the child pointer points to a new list
3551-
of items contained within the sequence\footnote{The same will be true for the SET data type when I eventually support it.}.
3614+
When a SEQUENCE or SET has been encountered a SEQUENCE (or SET resp.) item will be added as a sibbling (e.g. list.type == LTC\_ASN1\_SEQUENCE) and the child
3615+
pointer points to a new list of items contained within the object.
35523616
35533617
\index{der\_decode\_sequence\_flexi()}
35543618
\begin{verbatim}
@@ -5012,5 +5076,5 @@ \subsection{RSA Functions}
50125076
\end{document}
50135077
50145078
% $Source: /cvs/libtom/libtomcrypt/crypt.tex,v $
5015-
% $Revision: 1.55 $
5016-
% $Date: 2005/11/18 01:45:03 $
5079+
% $Revision: 1.59 $
5080+
% $Date: 2005/11/24 01:53:18 $

doc/crypt.pdf

4.38 KB
Binary file not shown.

makefile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Modified by Clay Culver
55

66
# The version
7-
VERSION=1.07
7+
VERSION=1.08
88

99
# Compiler and Linker Names
1010
#CC=gcc
@@ -101,6 +101,7 @@ GROUP=wheel
101101
endif
102102

103103
#List of objects to compile.
104+
#START_INS
104105
OBJECTS=src/ciphers/aes/aes_enc.o src/ciphers/aes/aes.o src/ciphers/anubis.o src/ciphers/blowfish.o \
105106
src/ciphers/cast5.o src/ciphers/des.o src/ciphers/khazad.o src/ciphers/noekeon.o src/ciphers/rc2.o \
106107
src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o src/ciphers/safer/safer_tab.o \
@@ -165,10 +166,13 @@ src/pk/asn1/der/octet/der_length_octet_string.o \
165166
src/pk/asn1/der/printable_string/der_decode_printable_string.o \
166167
src/pk/asn1/der/printable_string/der_encode_printable_string.o \
167168
src/pk/asn1/der/printable_string/der_length_printable_string.o \
168-
src/pk/asn1/der/sequence/der_decode_sequence.o src/pk/asn1/der/sequence/der_decode_sequence_flexi.o \
169-
src/pk/asn1/der/sequence/der_decode_sequence_multi.o src/pk/asn1/der/sequence/der_encode_sequence.o \
169+
src/pk/asn1/der/sequence/der_decode_sequence_ex.o \
170+
src/pk/asn1/der/sequence/der_decode_sequence_flexi.o \
171+
src/pk/asn1/der/sequence/der_decode_sequence_multi.o \
172+
src/pk/asn1/der/sequence/der_encode_sequence_ex.o \
170173
src/pk/asn1/der/sequence/der_encode_sequence_multi.o src/pk/asn1/der/sequence/der_length_sequence.o \
171-
src/pk/asn1/der/sequence/der_sequence_free.o src/pk/asn1/der/short_integer/der_decode_short_integer.o \
174+
src/pk/asn1/der/sequence/der_sequence_free.o src/pk/asn1/der/set/der_encode_set.o \
175+
src/pk/asn1/der/set/der_encode_setof.o src/pk/asn1/der/short_integer/der_decode_short_integer.o \
172176
src/pk/asn1/der/short_integer/der_encode_short_integer.o \
173177
src/pk/asn1/der/short_integer/der_length_short_integer.o src/pk/asn1/der/utctime/der_decode_utctime.o \
174178
src/pk/asn1/der/utctime/der_encode_utctime.o src/pk/asn1/der/utctime/der_length_utctime.o \
@@ -196,6 +200,7 @@ src/headers/tomcrypt_custom.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt
196200
src/headers/tomcrypt_pk.h src/headers/tomcrypt_hash.h src/headers/tomcrypt_math.h \
197201
src/headers/tomcrypt_misc.h src/headers/tomcrypt.h src/headers/tomcrypt_pkcs.h \
198202
src/headers/tomcrypt_prng.h testprof/tomcrypt_test.h
203+
#END_INS
199204

200205
TESTOBJECTS=demos/test.o
201206
HASHOBJECTS=demos/hashsum.o
@@ -356,5 +361,5 @@ zipup: no_oops docs
356361

357362

358363
# $Source: /cvs/libtom/libtomcrypt/makefile,v $
359-
# $Revision: 1.103 $
360-
# $Date: 2005/11/18 01:46:22 $
364+
# $Revision: 1.108 $
365+
# $Date: 2005/11/23 02:34:57 $

makefile.icc

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ ifndef DATAPATH
8888
endif
8989

9090
#List of objects to compile.
91+
#START_INS
9192
OBJECTS=src/ciphers/aes/aes_enc.o src/ciphers/aes/aes.o src/ciphers/anubis.o src/ciphers/blowfish.o \
9293
src/ciphers/cast5.o src/ciphers/des.o src/ciphers/khazad.o src/ciphers/noekeon.o src/ciphers/rc2.o \
9394
src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o src/ciphers/safer/safer_tab.o \
@@ -152,10 +153,13 @@ src/pk/asn1/der/octet/der_length_octet_string.o \
152153
src/pk/asn1/der/printable_string/der_decode_printable_string.o \
153154
src/pk/asn1/der/printable_string/der_encode_printable_string.o \
154155
src/pk/asn1/der/printable_string/der_length_printable_string.o \
155-
src/pk/asn1/der/sequence/der_decode_sequence.o src/pk/asn1/der/sequence/der_decode_sequence_flexi.o \
156-
src/pk/asn1/der/sequence/der_decode_sequence_multi.o src/pk/asn1/der/sequence/der_encode_sequence.o \
156+
src/pk/asn1/der/sequence/der_decode_sequence_ex.o \
157+
src/pk/asn1/der/sequence/der_decode_sequence_flexi.o \
158+
src/pk/asn1/der/sequence/der_decode_sequence_multi.o \
159+
src/pk/asn1/der/sequence/der_encode_sequence_ex.o \
157160
src/pk/asn1/der/sequence/der_encode_sequence_multi.o src/pk/asn1/der/sequence/der_length_sequence.o \
158-
src/pk/asn1/der/sequence/der_sequence_free.o src/pk/asn1/der/short_integer/der_decode_short_integer.o \
161+
src/pk/asn1/der/sequence/der_sequence_free.o src/pk/asn1/der/set/der_encode_set.o \
162+
src/pk/asn1/der/set/der_encode_setof.o src/pk/asn1/der/short_integer/der_decode_short_integer.o \
159163
src/pk/asn1/der/short_integer/der_encode_short_integer.o \
160164
src/pk/asn1/der/short_integer/der_length_short_integer.o src/pk/asn1/der/utctime/der_decode_utctime.o \
161165
src/pk/asn1/der/utctime/der_encode_utctime.o src/pk/asn1/der/utctime/der_length_utctime.o \
@@ -183,6 +187,7 @@ src/headers/tomcrypt_custom.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt
183187
src/headers/tomcrypt_pk.h src/headers/tomcrypt_hash.h src/headers/tomcrypt_math.h \
184188
src/headers/tomcrypt_misc.h src/headers/tomcrypt.h src/headers/tomcrypt_pkcs.h \
185189
src/headers/tomcrypt_prng.h testprof/tomcrypt_test.h
190+
#END_INS
186191

187192
#Who do we install as?
188193
ifdef INSTALL_USER
@@ -261,5 +266,6 @@ install: library
261266
install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
262267

263268
# $Source: /cvs/libtom/libtomcrypt/makefile.icc,v $
264-
# $Revision: 1.44 $
265-
# $Date: 2005/11/18 01:46:22 $
269+
# $Revision: 1.45 $
270+
# $Date: 2005/11/23 02:34:57 $
271+

makefile.msvc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#Tom St Denis
44
CFLAGS = /Isrc/headers/ /Itestprof/ /Ox /DWIN32 /DLTC_SOURCE /W3 /Fo$@ $(CF)
55

6+
#START_INS
67
OBJECTS=src/ciphers/aes/aes_enc.obj src/ciphers/aes/aes.obj src/ciphers/anubis.obj src/ciphers/blowfish.obj \
78
src/ciphers/cast5.obj src/ciphers/des.obj src/ciphers/khazad.obj src/ciphers/noekeon.obj src/ciphers/rc2.obj \
89
src/ciphers/rc5.obj src/ciphers/rc6.obj src/ciphers/safer/safer.obj src/ciphers/safer/safer_tab.obj \
@@ -67,10 +68,13 @@ src/pk/asn1/der/octet/der_length_octet_string.obj \
6768
src/pk/asn1/der/printable_string/der_decode_printable_string.obj \
6869
src/pk/asn1/der/printable_string/der_encode_printable_string.obj \
6970
src/pk/asn1/der/printable_string/der_length_printable_string.obj \
70-
src/pk/asn1/der/sequence/der_decode_sequence.obj src/pk/asn1/der/sequence/der_decode_sequence_flexi.obj \
71-
src/pk/asn1/der/sequence/der_decode_sequence_multi.obj src/pk/asn1/der/sequence/der_encode_sequence.obj \
71+
src/pk/asn1/der/sequence/der_decode_sequence_ex.obj \
72+
src/pk/asn1/der/sequence/der_decode_sequence_flexi.obj \
73+
src/pk/asn1/der/sequence/der_decode_sequence_multi.obj \
74+
src/pk/asn1/der/sequence/der_encode_sequence_ex.obj \
7275
src/pk/asn1/der/sequence/der_encode_sequence_multi.obj src/pk/asn1/der/sequence/der_length_sequence.obj \
73-
src/pk/asn1/der/sequence/der_sequence_free.obj src/pk/asn1/der/short_integer/der_decode_short_integer.obj \
76+
src/pk/asn1/der/sequence/der_sequence_free.obj src/pk/asn1/der/set/der_encode_set.obj \
77+
src/pk/asn1/der/set/der_encode_setof.obj src/pk/asn1/der/short_integer/der_decode_short_integer.obj \
7478
src/pk/asn1/der/short_integer/der_encode_short_integer.obj \
7579
src/pk/asn1/der/short_integer/der_length_short_integer.obj src/pk/asn1/der/utctime/der_decode_utctime.obj \
7680
src/pk/asn1/der/utctime/der_encode_utctime.obj src/pk/asn1/der/utctime/der_length_utctime.obj \
@@ -98,6 +102,7 @@ src/headers/tomcrypt_custom.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt
98102
src/headers/tomcrypt_pk.h src/headers/tomcrypt_hash.h src/headers/tomcrypt_math.h \
99103
src/headers/tomcrypt_misc.h src/headers/tomcrypt.h src/headers/tomcrypt_pkcs.h \
100104
src/headers/tomcrypt_prng.h testprof/tomcrypt_test.h
105+
#END_INS
101106

102107
default: library
103108

@@ -124,6 +129,5 @@ timing: demos/timing.c library
124129
cl $(CFLAGS) demos/timing.c testprof/tomcrypt_prof.lib tomcrypt.lib advapi32.lib $(EXTRALIBS)
125130

126131
# $Source: /cvs/libtom/libtomcrypt/makefile.msvc,v $
127-
# $Revision: 1.24 $
128-
# $Date: 2005/11/18 01:46:22 $
129-
132+
# $Revision: 1.25 $
133+
# $Date: 2005/11/23 02:34:57 $

makefile.shared

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Tom St Denis
77

88
# The version
9-
VERSION=0:107
9+
VERSION=0:108
1010

1111
# Compiler and Linker Names
1212
CC=libtool --mode=compile gcc
@@ -95,6 +95,7 @@ GROUP=wheel
9595
endif
9696

9797
#List of objects to compile.
98+
#START_INS
9899
OBJECTS=src/ciphers/aes/aes_enc.o src/ciphers/aes/aes.o src/ciphers/anubis.o src/ciphers/blowfish.o \
99100
src/ciphers/cast5.o src/ciphers/des.o src/ciphers/khazad.o src/ciphers/noekeon.o src/ciphers/rc2.o \
100101
src/ciphers/rc5.o src/ciphers/rc6.o src/ciphers/safer/safer.o src/ciphers/safer/safer_tab.o \
@@ -159,10 +160,13 @@ src/pk/asn1/der/octet/der_length_octet_string.o \
159160
src/pk/asn1/der/printable_string/der_decode_printable_string.o \
160161
src/pk/asn1/der/printable_string/der_encode_printable_string.o \
161162
src/pk/asn1/der/printable_string/der_length_printable_string.o \
162-
src/pk/asn1/der/sequence/der_decode_sequence.o src/pk/asn1/der/sequence/der_decode_sequence_flexi.o \
163-
src/pk/asn1/der/sequence/der_decode_sequence_multi.o src/pk/asn1/der/sequence/der_encode_sequence.o \
163+
src/pk/asn1/der/sequence/der_decode_sequence_ex.o \
164+
src/pk/asn1/der/sequence/der_decode_sequence_flexi.o \
165+
src/pk/asn1/der/sequence/der_decode_sequence_multi.o \
166+
src/pk/asn1/der/sequence/der_encode_sequence_ex.o \
164167
src/pk/asn1/der/sequence/der_encode_sequence_multi.o src/pk/asn1/der/sequence/der_length_sequence.o \
165-
src/pk/asn1/der/sequence/der_sequence_free.o src/pk/asn1/der/short_integer/der_decode_short_integer.o \
168+
src/pk/asn1/der/sequence/der_sequence_free.o src/pk/asn1/der/set/der_encode_set.o \
169+
src/pk/asn1/der/set/der_encode_setof.o src/pk/asn1/der/short_integer/der_decode_short_integer.o \
166170
src/pk/asn1/der/short_integer/der_encode_short_integer.o \
167171
src/pk/asn1/der/short_integer/der_length_short_integer.o src/pk/asn1/der/utctime/der_decode_utctime.o \
168172
src/pk/asn1/der/utctime/der_encode_utctime.o src/pk/asn1/der/utctime/der_length_utctime.o \
@@ -190,6 +194,7 @@ src/headers/tomcrypt_custom.h src/headers/tomcrypt_argchk.h src/headers/tomcrypt
190194
src/headers/tomcrypt_pk.h src/headers/tomcrypt_hash.h src/headers/tomcrypt_math.h \
191195
src/headers/tomcrypt_misc.h src/headers/tomcrypt.h src/headers/tomcrypt_pkcs.h \
192196
src/headers/tomcrypt_prng.h testprof/tomcrypt_test.h
197+
#END_INS
193198

194199
TESTOBJECTS=demos/test.o
195200
HASHOBJECTS=demos/hashsum.o
@@ -250,6 +255,5 @@ timing: library testprof/$(LIBTEST) $(TIMINGS)
250255
gcc -o $(TIMING) $(TIMINGS) -ltomcrypt_prof -ltomcrypt $(EXTRALIBS)
251256

252257
# $Source: /cvs/libtom/libtomcrypt/makefile.shared,v $
253-
# $Revision: 1.36 $
254-
# $Date: 2005/11/18 01:46:22 $
255-
258+
# $Revision: 1.38 $
259+
# $Date: 2005/11/23 02:34:57 $

src/headers/tomcrypt.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ extern "C" {
1616
#endif
1717

1818
/* version */
19-
#define CRYPT 0x0107
20-
#define SCRYPT "1.07"
19+
#define CRYPT 0x0108
20+
#define SCRYPT "1.08"
2121

2222
/* max size of either a cipher/hash block or symmetric key [largest of the two] */
2323
#define MAXBLOCKSIZE 128

0 commit comments

Comments
 (0)