ChangeLog 201 KB
Newer Older
1
2
2012-04-17  Niels Möller  <nisse@lysator.liu.se>

3
4
5
6
	* testsuite/salsa20-test.c (test_salsa20_stream): Check that
	salsa20_crypt doesn't write beyond the given destination area.
	(test_salsa20): Likewise.

7
8
9
	* salsa20-crypt.c: Renamed file, from...
	* salsa20.c: ... old name.

Niels Möller's avatar
Niels Möller committed
10
11
	* x86_64/machine.m4 (WREG): New macro.

12
13
14
15
16
	* salsa20.c (salsa20_hash): Deleted function, inlined into
	salsa20_crypt.
	(salsa20_set_key, salsa20_set_iv): Moved, to...
	* salsa20-set-key.c: ...new file.

Niels Möller's avatar
Niels Möller committed
17
18
19
20
21
2012-04-15  Niels Möller  <nisse@lysator.liu.se>

	* testsuite/salsa20-test.c (test_salsa20_stream): New function.
	(test_main): Tests for encrypting more than one block at a time.

22
23
2012-04-14  Niels Möller  <nisse@lysator.liu.se>

24
25
	* examples/io.c (write_file): Use write_string.

26
27
28
	* examples/Makefile.in (base64enc): New targets. Also
	added missing io.o dependency to several other targets.
	(base64dec, base16enc, base16dec): Likewise.
29
30
31

	* examples/base64enc.c: New file, based on example code
	contributed by Jeronimo Pellegrini.
32
33
34
	* examples/base64dec.c: Likewise.
	* examples/base16enc.c: Likewise.
	* examples/base16dec.c: Likewise.
35

36
37
38
39
40
41
42
	* examples/rsa-encrypt.c (process_file): Reorganized fread loop.
	(usage): New function.
	(main): Implemented --help option.

	* examples/rsa-decrypt.c (process_file): Improved error message
	for too short input file.

43
44
45
46
47
48
49
50
51
	* aes-set-decrypt-key.c (gf2_log, gf2_exp): Deleted tables.
	(mult, inv_mix_column): Deleted functions.
	(mtable): New table.
	(MIX_COLUMN): New macro.
	(aes_invert_key): Use MIX_COLUMN and mtable.

	* aesdata.c (compute_mtable): New table, for the inv mix column
	operation in aes_invert_key.

52
53
2012-04-13  Niels Möller  <nisse@lysator.liu.se>

54
55
56
57
	* aes-set-encrypt-key.c (aes_set_encrypt_key): Use LE_READ_UINT32.
	Tabulate the needed "round constants".
	(xtime): Deleted function.

58
59
60
	* aes-internal.h (SUBBYTE): Cast to uint32_t. Use B0, ..., B3
	macros.

61
62
2012-04-09  Niels Möller  <nisse@lysator.liu.se>

63
64
65
66
67
68
69
70
71
72
73
	Timing resistant RSA decryption, based on RSA blinding code
	contributed by Nikos Mavrogiannopoulos.
	* rsa-decrypt-tr.c (rsa_decrypt_tr): New function.
	(rsa_blind): Helper function.
	(rsa_unblind): Helper function.
	* rsa.h: Declare rsa_decrypt_tr. Some cleanups, no longer include
	nettle-meta.h, more consistent declrations of function pointer
	arguments.
	* testsuite/rsa-encrypt-test.c (test_main): Test rsa_encrypt_tr.
	Check for writes past the end of the message area.

74
75
76
77
78
	* Makefile.in (hogweed_SOURCES): Added pkcs1-decrypt.c.
	* rsa-decrypt.c (rsa_decrypt): Use pkcs1_decrypt.
	* pkcs1-decrypt.c (pkcs1_decrypt): New file and function,
	extracted from rsa_decrypt.

Niels Möller's avatar
Niels Möller committed
79
80
81
2012-04-01  Niels Möller  <nisse@lysator.liu.se>

	* salsa20.c (LE_SWAP32): Typo fix for big-endian case.
Niels Möller's avatar
Niels Möller committed
82
83
	(QROUND): New macro.
	(salsa20_hash): Use it.
Niels Möller's avatar
Niels Möller committed
84

Niels Möller's avatar
Niels Möller committed
85
86
2012-03-31  Niels Möller  <nisse@lysator.liu.se>

87
88
	* salsa20.c: (salsa20_set_iv): Deleted size argument, only one
	size allowed.
Niels Möller's avatar
Niels Möller committed
89
90
	(U8TO32_LITTLE): Deleted macro. Use LE_READ_UINT32 instead, which
	avoids unaligned reads.
Niels Möller's avatar
Niels Möller committed
91
92
	(salsa20_set_key): Rearranged slightly, to avoid unnecessary
	byte-to-word conversions.
Niels Möller's avatar
Niels Möller committed
93

94
95
96
97
98
99
100
101
	(LE_SWAP32): Renamed macro from...
	(U32TO32_LITTLE): ... old name.
	(U32TO8_LITTLE): Deleted macro.
	(salsa20_wordtobyte): Renamed function to...
	(salsa20_hash): ... new name. Changed output argument from byte
	array to word array. Use memxor3, which brings a considerable
	performance gain.

102
103
104
105
106
	* nettle-internal.c (salsa20_set_key_hack): Updated salsa20_set_iv
	call.
	* testsuite/salsa20-test.c (test_salsa20): Deleted iv_length
	argument, updated all calls.

Niels Möller's avatar
Niels Möller committed
107
108
109
110
	* salsa20.h (SALSA20_BLOCK_SIZE): New constant.
	(_SALSA20_INPUT_LENGTH): New constant.
	* salsa20.c: Use these constants.

Niels Möller's avatar
Niels Möller committed
111
112
113
114
115
	* salsa20.c (ROTL32): Deleted macro, use the one from macros.h
	instead, with reversed order of arguments.
	(ROTATE, XOR, PLUS, PLUSONE): Deleted macros, use ROTL32 and
	builtin operators directly.

Niels Möller's avatar
Niels Möller committed
116
	Unification of rotation macros.
Niels Möller's avatar
Niels Möller committed
117
118
	* macros.h (ROTL32): New macro, to replace (almost) all other
	rotation macros.
119

Niels Möller's avatar
Niels Möller committed
120
121
122
	* aes-set-encrypt-key.c: Include macros.h.
	(aes_set_encrypt_key): Use ROTL32.
	* aes-internal.h (ROTBYTE, ROTRBYTE): Deleted macros.
123

124
125
126
127
128
	* camellia-internal.h (ROL32): Deleted macro.
	(ROTL128): Renamed for consistency, from...
	(ROL128): ... old name.
	* camellia-crypt-internal.c: Updated for renamed rotation macros.
	* camellia-set-encrypt-key.c: Likewise.
129
130
131
	* cast128.c (ROL): Deleted macro.
	(F1, F2, F3): Updated to use ROTL32 (reversed order of arguments).
	Also added proper do { ... } while (0) wrappers.
132

133
134
	* ripemd160-compress.c (ROL32): Deleted macro.
	(R): Updated to use ROTL32 (reversed order of arguments).
Niels Möller's avatar
Niels Möller committed
135

136
137
138
139
140
141
142
143
144
	* serpent-internal.h (ROL32): Deleted macro.
	(ROTL64): Renamed (from ROL64) and reorderd arguments, for
	consistency.
	(RSHIFT64): Reordered arguments, for consistency.
	* serpent-decrypt.c: Updated for renamed rotation macros, with
	reversed argument order.
	* serpent-encrypt.c: Likewise.
	* serpent-set-key.c: Likewise.

Niels Möller's avatar
Niels Möller committed
145
146
	* sha1-compress.c (ROTL): Deleted macro, use ROTL32 instead.

Niels Möller's avatar
Niels Möller committed
147
148
149
150
	* sha256-compress.c (ROTR): Deleted macro. Replaced by ROTL32,
	with complemented shift count.
	(SHR): Deleted macro, use plain shift operator instead.

151
152
153
154
155
	* sha512-compress.c (ROTR): Deleted macro, replaced by...
	(ROTL64): ...new macro, with complemented shift count
	(SHR): Deleted macro, use plain shift operator instead.
	(S0, S1, s0, s1): Updated accordingly.

156
157
2012-03-30  Niels Möller  <nisse@lysator.liu.se>

158
159
160
161
162
163
164
165
	* nettle-internal.c (nettle_salsa20): Cipher struct for
	benchmarking only. Sets a fix zero IV, and ignores block size.
	* nettle-internal.h (nettle_salsa20): Declare it.

	* examples/nettle-benchmark.c (block_cipher_p): New function.
	(time_cipher): Use block_cipher_p.
	(main): Include salsa20 in benchmark.

166
	* Makefile.in (soname link): Fixed logic.
167
168
169
170
171
172
	(nettle_SOURCES): Removed nettle-internal.c, so that it's not
	parrt of the library...
	(internal_SOURCES): ...and put it here.
	* testsuite/Makefile.in (TEST_OBJS): Added ../nettle-internal.o.
	* examples/Makefile.in (BENCH_OBJS): New variable, to simplify the
	nettle-benchmark rule. Also link with ../nettle-internal.o.
173

174
175
2012-03-29  Niels Möller  <nisse@lysator.liu.se>

176
177
178
179
180
181
182
183
	Implementation of Salsa20, contributed by Simon Josefsson.
	* salsa20.h: New file.
	* salsa20.c: New file.
	* Makefile.in (nettle_SOURCES): Added salsa20.c
	(HEADERS): Added salsa20.h.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added salsa20-test.c.
	* testsuite/salsa20-test.c: New test case.

184
185
	* Makefile.in (soname links): Adding missing space before ].

186
187
188
189
2012-03-23  Niels Möller  <nisse@lysator.liu.se>

	* arcfour.h (arcfour_stream): Deleted obsolete prototype.

190
191
192
193
2012-03-05  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac (enable_shared): Build shared libraries by default.

194
195
196
197
198
2012-03-04  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.4.
	(LIBHOGWEED_MINOR): And to 2.2.

199
200
2012-02-27  Niels Möller  <nisse@lysator.liu.se>

201
202
	* list-obj-sizes.awk: Recognize elf64 objects.

Niels Möller's avatar
Niels Möller committed
203
204
	* Makefile.in (.texinfo.dvi): Pass -b option to texi2dvi.

205
206
207
208
209
210
211
212
213
214
	* Makefile.in (TARGETS): Added twofishdata.
	(SOURCES): Added twofishdata.c.
	(twofishdata): New rule.

	* twofish.c (q0, q1): Made const, and reformatted to match the
	twofishdata program.

	* twofishdata.c: Resurrected old file. Used to be called
	generate_q.c, when the twofish code was contributed back in 1999.

215
216
217
218
	* nettle.texinfo: Documentation for base16 and base64 encoding.
	Text contributed by Jeronimo Pellegrini
	<pellegrini@mpcnet.com.br>, back in April 2006.

Niels Möller's avatar
Niels Möller committed
219
220
2012-02-18  Niels Möller  <nisse@lysator.liu.se>

221
222
223
224
225
226
227
228
229
230
231
232
	* run-tests, getopt.c, getopt1.c, getopt.h: These files were moved
	to the top-level in the conversion to an independent git
	repository. They used to be symlinks to lsh files, from the
	subdirectories which use them.

	* Makefile.in: Build and distribute getopt files. Distribute
	run-tests script.
	* examples/Makefile.in: Adapt to getopt files and the run-tests
	script now located in the parent directory.
	* testsuite/Makefile.in: Likewise.
	* tools/Makefile.in: Likewise.

Niels Möller's avatar
Niels Möller committed
233
234
	* index.html: Converted to xhtml (from lsh repository, change
	dated 2012-02-03). Updated git instructions.
Niels Möller's avatar
Niels Möller committed
235

Niels Möller's avatar
Niels Möller committed
236
237
238
	* nettle.texinfo: Updated charset declaration.
	* misc/plan.html: Likewise.

Niels Möller's avatar
Niels Möller committed
239
2012-01-17  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
240

Niels Möller's avatar
Niels Möller committed
241
242
	* testsuite/Makefile.in (DISTFILES): Added setup-env.

Niels Möller's avatar
Niels Möller committed
243
244
245
246
247
248
249
250
251
252
253
254
255
256
	* examples/rsa-decrypt.c (main): Use _setmode rather than setmode,
	suggested by Eli Zaretskii. Affects windows builds only.
	* examples/rsa-encrypt.c: Likewise.

	* Makefile.in ($(LIBNETTLE_FORLINK)): Always create a .lib symlink
	to the library file. Use LN_S.
	($(LIBHOGWEED_FORLINK)): Likewise.

	(install-shared-nettle): Use LN_S.
	(install-shared-hogweed): Likewise.

	* configure.ac: Use AC_PROG_LN_S.
	* config.make.in (LN_S): New substitution.

Niels Möller's avatar
Niels Möller committed
257
258
259
	* testsuite/setup-env: New file. Wine workaround. Can't get
	../.lib into wine's dll search path, so create additional
	symlinks.
Niels Möller's avatar
Niels Möller committed
260
261
	* testsuite/teardown-env: ...and delete them here. Also delete
	file testtmp.
Niels Möller's avatar
Niels Möller committed
262
263
264
	* examples/setup-env: Similar links setup here.
	* examples/teardown-env: ... and deleted.

Niels Möller's avatar
Niels Möller committed
265
2012-01-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
266

Niels Möller's avatar
Niels Möller committed
267
	* examples/Makefile.in (check): Add ../.lib to PATH, like in
Niels Möller's avatar
Niels Möller committed
268
269
	testsuite/Makefile. Needed for w*ndows. Reported by Eli Zaretskii.

Niels Möller's avatar
Niels Möller committed
270
2011-11-25  Niels Möller  <nisse@lysator.liu.se>
Martin Storsjö's avatar
Martin Storsjö committed
271

Niels Möller's avatar
Niels Möller committed
272
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
273
274
	* x86_64/machine.m4 (W64_ENTRY, W64_EXIT): New macros for
	supporting W64 ABI.
275
	* x86_64: Updated all assembly files to use them.
Niels Möller's avatar
Niels Möller committed
276

Martin Storsjö's avatar
Martin Storsjö committed
277
	* configure.ac (W64_ABI): New variable, set when compiling for
Niels Möller's avatar
Niels Möller committed
278
	W64 ABI (64-bit M$ windows).
Martin Storsjö's avatar
Martin Storsjö committed
279
280
	* config.m4.in (W64_ABI): Define, from configure substitution.

Niels Möller's avatar
Niels Möller committed
281
2011-11-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
282

Niels Möller's avatar
Niels Möller committed
283
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
284
285
286
287
288
289
290
291
292
293
294
295
	* examples/Makefile.in (check): Pass $(EMULATOR) and $(EXEEXT) in
	the environment of run-tests.
	* examples/rsa-encrypt-test: Use $EXEEXT and $EMULATOR.
	* examples/rsa-sign-test: Likewise.
	* examples/rsa-verify-test: Likewise.
	* examples/setup-env: Likewise.

	* testsuite/Makefile.in (check): Pass $(EXEEXT) in the environment of
	run-tests.
	* testsuite/pkcs1-conv-test: Use $EXEEXT and $EMULATOR. Ignore \r
	in rsa-sign output.

Niels Möller's avatar
Niels Möller committed
296
297
298
299
	* examples/rsa-decrypt.c (main) [WIN32]: Set stdout/stdin to
	binary mode.
	* examples/rsa-encrypt.c (main): Likewise.

Niels Möller's avatar
Niels Möller committed
300
2011-11-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
301

302
303
304
	* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
	on w64.

305
	* serpent-internal.h (ROL64): Use (uint64_t) 1 rather than 1L, for
Niels Möller's avatar
Niels Möller committed
306
	M$ w64.
307
308
	(RSHIFT64): Likewise. Also added a missing parenthesis.

Niels Möller's avatar
Niels Möller committed
309
2011-11-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
310

Niels Möller's avatar
Niels Möller committed
311
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
312
313
314
315
316
	* testsuite/symbols-test: Use $NM, falling back to nm if undefined.
	* testsuite/Makefile.in (check): Pass $(NM) in the environment of
	run-tests.
	* config.make.in (NM): Set NM.

Niels Möller's avatar
Niels Möller committed
317
318
319
320
321
322
	* testsuite/sexp-conv-test: Use $EMULATOR when running test
	programs. Also ignore \r for output in the non-canonical output
	formats.
	* testsuite/Makefile.in (check): Pass $(EMULATOR) in the
	environment of run-tests.
	* configure.ac (EMULATOR): New substituted variable. Set to wine
323
	or wine64 when cross compiling for windows, otherwise empty.
Niels Möller's avatar
Niels Möller committed
324
325
	* config.make.in (EMULATOR): Set from autoconf value.

Niels Möller's avatar
Niels Möller committed
326
2011-11-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
327
328
329

	* x86/camellia-crypt-internal.asm: Take ALIGNOF_UINT64_T into
	account when getting the offset for the subkeys. Differs between
Niels Möller's avatar
Niels Möller committed
330
	w32 and other systems. w32 problem identified by Martin Storsjö.
Niels Möller's avatar
Niels Möller committed
331
332
333
334
335
336

	* config.m4.in: Define ALIGNOF_UINT64_T (from configure).

	* configure.ac: Check alignment of uint64_t, and also use AC_SUBST
	for use in config.m4.in.

Niels Möller's avatar
Niels Möller committed
337
2011-11-19  Niels Möller  <nisse@lysator.liu.se>
Martin Storsjö's avatar
Martin Storsjö committed
338

Niels Möller's avatar
Niels Möller committed
339
	Cygwin/mingw32 improvements contributed by Martin Storsjö:
340
341
342
343
344
	* Makefile.in (IMPLICIT_TARGETS): New variable for DLL link
	libraries.
	(clean-here): Delete the DLL import libraries.

	* configure.ac: Setup installation of DLL files in $bindir.
345
346
347
348
349
350
351
352
	(IF_DLL, LIBNETTLE_FILE_SRC, LIBHOGWEED_FILE_SRC): New
	substitutions.

	* config.make.in (LIBNETTLE_FILE_SRC): Substitute new autoconf
	variable.
	(LIBHOGWEED_FILE_SRC): Likewise.

	* Makefile.in (install-dll-nettle, uninstall-dll-nettle): New
353
	target for installing the DLL file in $bindir.
354
355
356
357
358
359
	(install-shared-nettle): Conditionally
	depend on install-dll-nettle. Use LIBNETTLE_FILE_SRC.
	(uninstall-shared-nettle): Conditionally depend on
	install-dll-nettle.
	(various hogweed targets): Analogous changes.

Martin Storsjö's avatar
Martin Storsjö committed
360
361
	* configure.ac: Unify shared lib setup for cygwin and mingw.

Niels Möller's avatar
Niels Möller committed
362
2011-10-31  Niels Möller  <nisse@lysator.liu.se>
363
364

	* configure.ac (LIBHOGWEED_LIBS): Typo fix for the darwin case.
Niels Möller's avatar
Niels Möller committed
365
	Spotted by Martin Storsjö.
366

Niels Möller's avatar
Niels Möller committed
367
2011-10-25  Niels Möller  <nisse@lysator.liu.se>
368
369
370
371

	* configure.ac (LIBHOGWEED_LIBS): cygwin fix, added
	libnettle.dll.a. Reported by Volker Zell.

Niels Möller's avatar
Niels Möller committed
372
2011-10-18  Niels Möller  <nisse@lysator.liu.se>
373

Niels Möller's avatar
Niels Möller committed
374
	* configure.ac: Improved setup för darwin shared libraries.
375
376
	Patch contributed by Ryan Schmidt.

Niels Möller's avatar
Niels Möller committed
377
2011-10-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
378
379
380
381
382
383
384
385
386

	* x86_64/memxor.asm: Implemented sse2-loop. Configured at compile
	time, and currently disabled.

	* testsuite/testutils.h (ASSERT): Write message to stderr.

	* testsuite/memxor-test.c: Use 16-byte alignment for "fully
	aligned" operands.

Niels Möller's avatar
Niels Möller committed
387
2011-09-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
388

Niels Möller's avatar
Niels Möller committed
389
390
391
392
393
394
395
396
	* x86/camellia-crypt-internal.asm: Use "l"-suffix on instructions
	more consistently. Reportedly, freebsd and netbsd systems with
	clang are more picky about this.

	* configure.ac: Changed version number to 2.5.

	* Released nettle-2.4.

397
398
	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.3.

Niels Möller's avatar
Niels Möller committed
399
400
401
	* gcm-aes.c: Include config.h.
	* tools/nettle-lfib-stream.c: Likewise.

Niels Möller's avatar
Niels Möller committed
402
403
404
	* ripemd160-compress.c: Added missing include of config.h. Needed
	for correct operation on big-endian systems.

Niels Möller's avatar
Niels Möller committed
405
2011-09-02  Niels Möller  <nisse@amfibolit.hack.org>
Niels Möller's avatar
Niels Möller committed
406
407
408
409
410

	* configure.ac: Changed version number to 2.4.

	* Released nettle-2.3.

Niels Möller's avatar
Niels Möller committed
411
2011-08-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
412
413
414
415
416
417
418

	* testsuite/hmac-test.c: Added tests for hmac-ripemd160.

	* hmac.h: Declare hmac-ripemd160 related functions.

	* Makefile.in (nettle_SOURCES): Added hmac-ripemd160.c.

Niels Möller's avatar
Niels Möller committed
419
2011-08-30  Niels Möller  <nisse@amfibolit.hack.org>
Niels Möller's avatar
Niels Möller committed
420
421
422
423
424
425
426

	* nettle.texinfo (Hash functions): Document ripemd-160.

	* hmac-ripemd160.c: New file.

	* hmac.h: Declare hmac-ripemd160 functions.

Niels Möller's avatar
Niels Möller committed
427
2011-08-29  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
428

Niels Möller's avatar
Niels Möller committed
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
	* sha256.c (sha256_update): Updated MD_UPDATE call for new
	conventions.
	(sha256_write_digest): Use MD_PAD rather than MD_FINAL, and insert
	the length manually.
	* sha512.c: Analogous changes.

	* sha1.c (COMPRESS): New macro.
	(sha1_update): Updated MD_UPDATE call for new conventions.
	(sha1_digest): Use MD_PAD rather than MD_FINAL, and insert the
	length manually.

	* ripemd160.c (ripemd160_init): Use memcpy for initializing the
	state vector.
	(COMPRESS): New macro.
	(ripemd160_update): Use MD_UPDATE.
	(ripemd160_digest): Inline ripemd160_final processing. Use MD_PAD
	and _nettle_write_le32.
	(ripemd160_final): Deleted function.

	* ripemd160.h (struct ripemd160_ctx): Use a 64-bit block count.
	Renamed digest to state.

	* md5.c (md5_init): Use memcpy for initializing the state vector.
	(COMPRESS): New macro, wrapping _nettle_md5_compress.
	(md5_update): Use MD_UPDATE.
	(md5_digest): Inline md5_final processing. Use MD_PAD and
	_nettle_write_le32.
	(md5_final): Deleted.

	* md5.h (struct md5_ctx): Renamed some fields, for consistency.

	* md4.h (struct md4_ctx): Renamed some fields, for consistency.

	* md4.c (md4_init): Use memcpy for initializing the state vector.
	(md4_update): Use MD_UPDATE.
	(md4_digest): Inline md4_final processing, using MD_PAD. Use
	_nettle_write_le32.
	(md4_block): Renamed, to...
	(md4_compress): ... new name. Take ctx pinter as argument.
	(md4_final): Deleted function.

	* md2.c (md2_update): Use MD_UPDATE.

	* macros.h (MD_UPDATE): Added incr argument. Invoke compression
	function with ctx pointer as argument, rather than ctx->state.
	(MD_FINAL): Just pad, don't store length field. Renamed to MD_PAD.
	(MD_PAD): Analogous change of compression invocations.

Niels Möller's avatar
Niels Möller committed
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
	* sha512.c: (COMPRESS): New macro wrapping _nettle_sha512_compress.
	(sha512_update): Use MD_UPDATE.
	(sha512_final): Deleted function.
	(sha512_write_digest): Use MD_FINAL.

	* sha256.c (COMPRESS): New macro wrapping _nettle_sha256_compress.
	(SHA256_INCR): Deleted macro.
	(sha256_update): Use MD_UPDATE.
	(sha256_final): Deleted function.
	(sha256_write_digest): New function, replacing sha256_final, and
	using MD_FINAL.
	(sha256_digest): Use sha256_write_digest.
	(sha224_digest): Likewise.

	* tools/nettle-hash.c (list_algorithms): Fixed typo in header.

	* sha1.c (SHA1_DATA_LENGTH): Deleted unused macro.
	(sha1_init): Use memcpy to initialize the state vector.
	(SHA1_INCR): Deleted macro.
	(sha1_update): Use MD_UPDATE macro, to reduce code duplication.
	(sha1_digest): Use MD_FINAL macro.
	(sha1_final): Deleted function.

	* sha.h (struct sha1_ctx): Renamed attribute digest to state.

	* macros.h (MD_UPDATE): New macro.
	(MD_FINAL): New macro.

Niels Möller's avatar
Niels Möller committed
505
2011-08-28  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
506

Niels Möller's avatar
Niels Möller committed
507
508
	* ripemd160.c (ripemd160_final): Use LE_WRITE_UINT32. Deleted byte
	swapping at the end, leaving it to ripemd160_digest.
Niels Möller's avatar
Niels Möller committed
509
	(ripemd160_digest): Use _nettle_write_le32.
Niels Möller's avatar
Niels Möller committed
510

Niels Möller's avatar
Niels Möller committed
511
512
513
514
515
516
517
518
519
	* Makefile.in (nettle_SOURCES): Added write-le32.c.

	* md5.c (md5_digest): Use _nettle_write_le32.

	* write-le32.c (_nettle_write_le32): New file and function.

	* ripemd160-compress.c (ROL32): Renamed macro (was "rol"). Deleted
	x86 version using inline assembly; at least gcc-4.4.5 recognizes
	shift-and-or expressions which are in fact rotations.
Niels Möller's avatar
Niels Möller committed
520
	(_nettle_ripemd160_compress): Use LE_READ_UINT32.
Niels Möller's avatar
Niels Möller committed
521

Niels Möller's avatar
Niels Möller committed
522
523
	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.2.

Niels Möller's avatar
Niels Möller committed
524
525
526
527
528
529
530
	* testsuite/meta-hash-test.c: Updated for the addition of
	ripemd-160.

	* testsuite/.test-rules.make: Added rule for ripemd160-test.

	* examples/nettle-benchmark.c (main): Benchmark ripemd-160.

Niels Möller's avatar
Niels Möller committed
531
2011-08-28  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546

	RIPEMD-160 hash function. Ported from libgcrypt by Andres Mejia.
	* testsuite/ripemd160-test.c: New file.
	* ripemd160.h: New file.
	* nettle-meta.h: Declare nettle_ripemd160.
	* ripemd160.c: New file, ported from libgcrypt.
	* ripemd160-compress.c: Likewise.
	* ripemd160-meta.c: New file.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added
	ripemd160-test.c.
	* nettle-meta-hashes.c (nettle_hashes): Added nettle_ripemd160.
	* Makefile.in (nettle_SOURCES): Added ripemd160.c,
	ripemd160-compress.c, and ripemd160-meta.c.
	(HEADERS): Added ripemd160.h.

Niels Möller's avatar
Niels Möller committed
547
2011-08-10  Niels Möller  <nisse@amfibolit.hack.org>
548
549
550
551

	* nettle.texinfo: Fixed mis-placed const in various prototypes.
	Spotted by Tatsuhiro Tsujikawa.

Niels Möller's avatar
Niels Möller committed
552
2011-07-24  Niels Möller  <nisse@lysator.liu.se>
553
554
555
556
557
558
559
560
561

	* Makefile.in (PKGCONFIG_FILES, pkgconfigdir): New variables.
	(DISTFILES): Added nettle.pc.in and hogweed.pc.in.
	(nettle.pc, hogweed.pc): New targets (invoking config.status).
	(install-pkgconfig, uninstall-pkgconfig): New targets.
	(install-here): Depend on install-pkgconfig.
	(uninstall-here): Depend on uninstall-pkgconfig.
	(distclean-here): Delete nettle.pc and hogweed.pc.

Niels Möller's avatar
Niels Möller committed
562
2011-07-20  Niels Möller  <nisse@lysator.liu.se>
563
564
565
566
567

	* configure.ac: Generate nettle.pc and hogweed.pc.

	* nettle.pc.in, hogweed.pc.in: New files.

Niels Möller's avatar
Niels Möller committed
568
2011-07-17  Niels Möller  <nisse@lysator.liu.se>
569
570
571

	* nettle-internal.h: Added missing extern declarations.

Niels Möller's avatar
Niels Möller committed
572
2011-07-11  Niels Möller  <nisse@lysator.liu.se>
573

Niels Möller's avatar
Niels Möller committed
574
575
576
577
	* configure.ac: Changed version number to 2.3.

	* Released nettle-2.2.

578
579
	* Makefile.in (DISTFILES): Distribute COPYING.LIB, not COPYING,

Niels Möller's avatar
Niels Möller committed
580
2011-07-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
581
582
583
584
585
586
587

	* tools/misc.h (werror): Removed incorrect noreturn attribute from
	declaration.

	* examples/io.c (read_file): Bug fix, in dependence of initial
	size on max_size.

Niels Möller's avatar
Niels Möller committed
588
2011-07-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
589

Niels Möller's avatar
Niels Möller committed
590
591
592
593
	* cbc.c	(CBC_BUFFER_LIMIT): Reduced to 512 bytes.
	(cbc_decrypt): For in-place operation, use overlapping memxor3 and
	eliminate a memcpy.

Niels Möller's avatar
Niels Möller committed
594
595
596
597
	* ctr.c (ctr_crypt): Reorganized to call the encryption function
	with several blocks at a time. Handle the case of a single block
	specially.

Niels Möller's avatar
Niels Möller committed
598
599
600
	* x86_64/memxor.asm: Added ALIGN for shifting loop. Deleted
	obsolete ifelse.

Niels Möller's avatar
Niels Möller committed
601
2011-06-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
602

Niels Möller's avatar
Niels Möller committed
603
604
	* configure.ac: Link in serpent-decrypt.asm, if found.

Niels Möller's avatar
Niels Möller committed
605
606
607
608
609
610
611
612
	* x86_64/serpent-decrypt.asm: Added an SSE2 loop, doing four
	blocks at a time in parallel.

	* x86_64/serpent-encrypt.asm: Include serpent.m4. Deleted a
	redundant label.

	* x86_64/serpent.m4: New file, with serpent-related macros.

Niels Möller's avatar
Niels Möller committed
613
2011-06-29  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
614

Niels Möller's avatar
Niels Möller committed
615
616
617
	* x86_64/serpent-decrypt.asm: Wrote main (32-bit) loop.
	(SBOX0I, SBOX1I, SBOX7I): Fixed bugs.

Niels Möller's avatar
Niels Möller committed
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
	* nettle.texinfo (Copyright): Updated for license change to
	LGPLv2+. Updated copyriight info on serpent.

	* NEWS: Updated information for nettle-2.2.

	* x86_64/serpent-decrypt.asm: New file.

	* x86_64/serpent-encrypt.asm: Fixed .file pseudo op.

	* testsuite/testutils.c (test_cipher_ctr): Display more info on
	failure.

	* examples/nettle-benchmark.c (bench_ctr): New function.
	(time_cipher): Also benchmark CTR mode.

Niels Möller's avatar
Niels Möller committed
633
634
635
636
	* configure.ac (LIBNETTLE_MINOR): Updated library version number
	to 4.1.
	(LIBHOGWEED_MINOR): And to 2.1.

Niels Möller's avatar
Niels Möller committed
637
2011-06-22  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
638
639
640
641

	* configure.ac: Use pwd -P when examining lib directories.
	Link in serpent-encrypt.asm, if found.

Niels Möller's avatar
Niels Möller committed
642
2011-06-21  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
643
644
645

	* serpent-decrypt.c (SBOX3_INVERSE): Eliminated temporaries.
	(SBOX4_INVERSE): Likewise.
Niels Möller's avatar
Niels Möller committed
646
647
648
	(SBOX5_INVERSE): Likewise.
	(SBOX6_INVERSE): Likewise.
	(SBOX7_INVERSE): Likewise.
649
	(All SBOX_INVERSE-macros): Deleted type argument, and updated users.
Niels Möller's avatar
Niels Möller committed
650

Niels Möller's avatar
Niels Möller committed
651
2011-06-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
652

Niels Möller's avatar
Niels Möller committed
653
654
655
656
657
	* serpent-decrypt.c: Renamed arguments in sbox macros.
	(SBOX0_INVERSE): Eliminated temporaries.
	(SBOX1_INVERSE): Likewise.
	(SBOX2_INVERSE): Likewise.

Niels Möller's avatar
Niels Möller committed
658
659
660
661
662
663
	* x86_64/serpent-encrypt.asm: Added an SSE2 loop, doing four
	blocks at a time in parallel.

	* testsuite/serpent-test.c (test_main): Added some more multiple
	block tests.

Niels Möller's avatar
Niels Möller committed
664
2011-06-15  Niels Möller  <nisse@lysator.liu.se>
665
666
667
668
669
670

	* configure.ac (libdir): On 64-bit Linux, we used to assume that
	libraries are installed according to the FHS. Since at least
	Fedora and Gentoo follow the FHS convention, while at least Debian
	doesn't, we have to try to figure out which convention is used.

Niels Möller's avatar
Niels Möller committed
671
2011-06-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
672

Niels Möller's avatar
Niels Möller committed
673
674
	* x86_64/serpent-encrypt.asm: Slight simplification of loop logic.

Niels Möller's avatar
Niels Möller committed
675
676
	* x86_64/serpent-encrypt.asm: New file.

Niels Möller's avatar
Niels Möller committed
677
2011-06-12  Niels Möller  <nisse@lysator.liu.se>
678

Niels Möller's avatar
Niels Möller committed
679
680
681
	* testsuite/serpent-test.c (test_main): Added tests with multiple
	blocks at a time.

682
683
684
685
686
	* serpent-encrypt.c (SBOX6): Renamed arguments. Eliminated
	temporaries.
	(SBOX7): Likewise.
	(All SBOX-macros): Deleted type argument, and updated users.

Niels Möller's avatar
Niels Möller committed
687
	* configure.ac: Display summary at the end of configure..
688
689
	(asm_path): Set only if enable_assember is yes.

Niels Möller's avatar
Niels Möller committed
690
2011-06-10  Niels Möller  <nisse@lysator.liu.se>
691
692
693
694

	* serpent-encrypt.c (SBOX5): Renamed arguments. Eliminated
	temporaries.

Niels Möller's avatar
Niels Möller committed
695
2011-06-09  Niels Möller  <nisse@lysator.liu.se>
696

697
698
699
	* serpent-encrypt.c (SBOX4): Renamed arguments. Eliminated
	temporaries.

700
701
702
	* configure.ac (LIBNETTLE_LINK, LIBHOGWEED_LINK): Cygwin fix, from
	Vincent Torri.

Niels Möller's avatar
Niels Möller committed
703
2011-06-08  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
704
705
706
707
708
709

	* examples/eratosthenes.c (find_first_one): Fixed c99-style
	declaration. Reported by Sebastian Reitenbach.
	(find_first_one): Declare the lookup table as static const, and
	use unsigned char rather than unsigned..

Niels Möller's avatar
Niels Möller committed
710
2011-06-07  Niels Möller  <nisse@lysator.liu.se>
711
712
713

	* serpent-encrypt.c (SBOX0): Renamed arguments. Eliminated
	temporaries.
714
	(SBOX1): Likewise.
715
	(SBOX2): Likewise.
716
	(SBOX3): Likewise.
717

Niels Möller's avatar
Niels Möller committed
718
2011-06-06  Niels Möller  <nisse@lysator.liu.se>
719

720
721
722
723
724
725
726
727
728
729
	* Makefile.in (DISTFILES): Added serpent-internal.h.
	(nettle_SOURCES): Replaced serpent.c by serpent-set-key.c,
	serpent-encrypt.c, and serpent-decrypt.c.

	* serpent.c: Replaced by several new files.
	* serpent-set-key.c: New file.
	* serpent-encrypt.c: New file.
	* serpent-decrypt.c: New file.
	* serpent-internal.h: New file.

730
731
732
733
	* serpent.c [HAVE_NATIVE_64_BIT]: Process two blocks at a time in
	parallel. Measured speedup of 10%--25% (higher for encryption) on
	x86_64.

Niels Möller's avatar
Niels Möller committed
734
2011-06-01  Niels Möller  <nisse@lysator.liu.se>
735

736
737
738
739
740
741
742
743
744
745
746
747
748
749
	* serpent.c (ROUNDS): Deleted macro.
	(serpent_block_t): Deleted array typedef.
	(KEYXOR): New macro, replacing BLOCK_XOR.
	(BLOCK_COPY, SBOX, SBOX_INVERSE): Deleted macros.
	(LINEAR_TRANSFORMATION): Use four separate arguments.
	(LINEAR_TRANSFORMATION_INVERSE): Likewise.
	(ROUND): Take separate arguments for all input and output words.
	(ROUND_INVERSE): Likewise.
	(ROUND_LAST, ROUND_FIRST_INVERSE): Deleted macros.
	(serpent_set_key): Moved loop termination test.
	(serpent_encrypt): Rewrote with unrolling of just eight rounds,
	and without serpent_block_t.
	(serpent_decrypt): Likewise.

750
751
752
753
754
755
756
757
758
759
	* serpent.c: Added do { ... } while (0) around block macros.
	(serpent_key_t): Deleted array typedef.
	(ROL32, ROR32): Renamed macros, were rol and ror.
	(KS_RECURRENCE, KS): New macros.
	(serpent_key_pad): Renamed, from...
	(serpent_key_prepare): ...old name.
	(serpent_subkeys_generate): Deleted function.
	(serpent_set_key): Rewrote the generation of subkeys. Reduced both
	temporary storage and code size (less unrolling)

Niels Möller's avatar
Niels Möller committed
760
2011-05-31  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
761

Niels Möller's avatar
Niels Möller committed
762
763
764
	* testsuite/serpent-test.c (test_main): Enabled test with short,
	40-bit, key.

Niels Möller's avatar
Niels Möller committed
765
766
767
768
	* serpent.c (byte_swap_32): Deleted macro.
	(serpent_key_prepare): Use LE_READ_UINT32. Don't require aligned
	input, and support arbitrary key sizes.

Simon Josefsson's avatar
Simon Josefsson committed
769
770
771
772
773
774
775
2011-05-30  Simon Josefsson  <simon@josefsson.org>

	* serpent.c: Rewrite, based on libgcrypt code.  License changed
	from GPL to LGPL.
	* serpent_sboxes.h: Removed.
	* Makefile.in: Drop serpent_sboxes.h.

Niels Möller's avatar
Niels Möller committed
776
2011-05-31  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
777
778
779
780

	* testsuite/serpent-test.c (test_main): Added some tests for
	padding of keys of length which is not a multiple of four bytes.

Niels Möller's avatar
Niels Möller committed
781
782
783
784
785
2011-05-30  Simon Josefsson  <simon@josefsson.org>

	* testsuite/serpent-test.c (test_main): Add test vectors from
	libgcrypt.

Niels Möller's avatar
Niels Möller committed
786
2011-05-21  Niels Möller  <nisse@lysator.liu.se>
787
788
789
790

	* dsa-keygen.c (dsa_generate_keypair): Avoid double init of mpz
	variable. Spotted by Nikos Mavrogiannopoulos.

Niels Möller's avatar
Niels Möller committed
791
2011-05-06  Niels Möller  <nisse@lysator.liu.se>
792
793
794
795
796

	* configure.ac: Fix link flags for shared libraries on Solaris,
	which needs -h to set the soname. Patch contributed by Dagobert
	Michelsen.

Niels Möller's avatar
Niels Möller committed
797
2011-05-06  Niels Möller  <nisse@lysator.liu.se>
798
799
800

	* configure.ac: New configure option --enable-gcov.

Niels Möller's avatar
Niels Möller committed
801
	* arcfour.h (arcfour_stream): Deleted obsolete define.
Niels Möller's avatar
Niels Möller committed
802

Niels Möller's avatar
Niels Möller committed
803
2011-04-27  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
804
805
806

	* tools/nettle-hash.c (find_algorithm): Require exact match.

Niels Möller's avatar
Niels Möller committed
807
2011-04-15  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
808
809
810
811
812
813
814
815
816
817
818
819

	Reverted broken byte-order change from 2001-06-17:
	* serpent.c (serpent_set_key): Use correct byteorder.
	(serpent_encrypt): Likewise.
	(serpent_decrypt): Likewise.

	* testsuite/serpent-test.c (decode_hex_reverse): New function.
	(RH, RHL): New macros.
	(test_main): Byte reverse inputs and outputs for the testvectors
	taken from the serpent submission package. Enable test vectors
	from http://www.cs.technion.ac.il/~biham/Reports/Serpent/.

Niels Möller's avatar
Niels Möller committed
820
2011-03-23  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
821

Niels Möller's avatar
Niels Möller committed
822
823
824
	* tools/sexp-conv.c (xalloc): Deleted function, now it's in misc.c
	instead.

Niels Möller's avatar
Niels Möller committed
825
826
	* configure.ac: Use LSH_FUNC_STRERROR.

Niels Möller's avatar
Niels Möller committed
827
828
829
830
831
832
833
834
835
836
837
	* tools/Makefile.in (TARGETS): Added nettle-hash, and related
	build rules.
	(SOURCES): Added nettle-hash.c.

	* tools/misc.c (xalloc): New function.

	* tools/pkcs1-conv.c (main): Made the OPT_* constants local, and
	fixed numerical values to start with non-ASCII 0x300.

	* tools/nettle-hash.c: New file.

Niels Möller's avatar
Niels Möller committed
838
2011-03-23  Niels Möller  <nisse@lysator.liu.se>
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859

	Contributed by Daniel Kahn Gillmor:
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added
	meta-hash-test.c, meta-cipher-test.c, and meta-armor-test.c.

	* testsuite/meta-hash-test.c: New file.
	* testsuite/meta-cipher-test.c: New file.
	* testsuite/meta-armor-test.c: New file.

	* nettle.texinfo: Document nettle_hashes and nettle_ciphers.

	* nettle-meta.h: Declare algorithm lists nettle_ciphers,
	nettle_hashes, nettle_armors.

	* Makefile.in (nettle_SOURCES): Added nettle-meta-hashes.c,
	nettle-meta-ciphers.c, and nettle-meta-armors.c.

	* nettle-meta-armors.c: New file.
	* nettle-meta-ciphers.c: New file.
	* nettle-meta-hashes.c: New file.

Niels Möller's avatar
Niels Möller committed
860
2011-02-18  Niels Möller  <nisse@lysator.liu.se>
861
862
863
864

	* arcfour.c (arcfour_stream): Deleted function. It's not very
	useful, and neither documented nor tested.

Niels Möller's avatar
Niels Möller committed
865
2011-02-16  Niels Möller  <nisse@lysator.liu.se>
866

Niels Möller's avatar
Niels Möller committed
867
868
869
870
	* cbc.h (CBC_ENCRYPT): Avoid using NULL; we don't ensure that it
	is defined.
	(CBC_DECRYPT): Likewise.

871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
	* gcm-aes.c (gcm_aes_set_iv): Use GCM_SET_IV.
	(gcm_aes_set_key): Deleted cast.
	(gcm_aes_encrypt): Likewise.
	(gcm_aes_decrypt): Likewise.
	(gcm_aes_digest): Likewise.
	(gcm_aes_update): One less argument to GCM_UPDATE.

	* gcm.h (GCM_SET_KEY): Added cast to nettle_crypt_func *. Help
	compiler type checking despite this cast.
	(GCM_ENCRYPT): Likewise.
	(GCM_DECRYPT): Likewise.
	(GCM_DIGEST): Likewise.
	(GCM_SET_IV): New macro, for completeness.
	(GCM_UPDATE): Deleted unused argument encrypt.

Niels Möller's avatar
Niels Möller committed
886
2011-02-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
887

Niels Möller's avatar
Niels Möller committed
888
889
890
	* nettle.texinfo: Split node on cipher modes, and started on
	the GCM documentation.

Niels Möller's avatar
Niels Möller committed
891
892
893
894
895
896
897
898
899
900
901
902
903
904
	* testsuite/gcm-test.c (test_gcm_aes): Deleted function, replaced
	by test_aead.
	(test_main): Use test_aead.

	* testsuite/testutils.c (test_aead): New function, replacing
	test_gcm_aes and before that test_cipher_gcm.

	* nettle-internal.c (nettle_gcm_aes128): New const struct.
	(nettle_gcm_aes192): Likewise.
	(nettle_gcm_aes256): Likewise.

	* nettle-internal.h (struct nettle_aead): Tentative interface for
	authenticated encryption with associated data.

Niels Möller's avatar
Niels Möller committed
905
906
907
908
909
	* examples/nettle-benchmark.c (time_gcm): Renamed. Updated for
	gcm_aes_auth to gcm_aes_update renaming. Benchmark both encryption
	and hashing.
	(time_gmac): ...old name.

Niels Möller's avatar
Niels Möller committed
910
911
912
913
914
915
916
917
	* nettle-internal.c (des_set_key_hack): Don't touch the bits
	parity, since thay are now ignored.
	(des3_set_key_hack): Likewise.

	* cast128-meta.c (nettle_cast128): Don't pass keysize.
	* nettle-meta.h (_NETTLE_CIPHER_FIX): Deleted keysize parameter
	derived from the appropriate constant instead.

Niels Möller's avatar
Niels Möller committed
918
919
920
	* testsuite/gcm-test.c (test_gcm_aes): Updated for gcm_aes_auth to
	gcm_aes_update renaming.

Niels Möller's avatar
Niels Möller committed
921
2011-02-13  Niels Möller  <nisse@lysator.liu.se>
922
923
924
925
926
927
928
929
930
931
932
933
934

	* gcm.h (GCM_UPDATE): Renamed, from...
	(GCM_AUTH): ...old name.

	* gcm-aes.c (gcm_aes_update): Renamed, from...
	(gcm_aes_auth): ...old name.

	* gcm.c (gcm_update): Renamed, and fixed an assert. From...
	(gcm_auth): ...old name.

	* gcm.h (GCM_TABLE_BITS): Increase table size to 8 bits,
	corresponding to 4 KByte of key-dependent tables.

Niels Möller's avatar
Niels Möller committed
935
2011-02-10  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
936
937
938
939
940

	* x86_64/memxor.asm: New file. Improves performance by 22% for the
	unaligned01 case and 35% for the unaligned12 case, benchmarked on
	Intel SU1400.

Niels Möller's avatar
Niels Möller committed
941
942
943
944
945
946
947
948
949
950
	* examples/nettle-benchmark.c (cgt_works_p): New function.
	(cgt_time_start): Likewise.
	(cgt_time_end): Likewise.
	(clock_time_start): Likewise.
	(clock_time_end): Likewise.
	(time_function): Read clock via function pointers time_start and
	time_end, so we can select method at runtime.
	(xalloc): Use die function.
	(main): Choose timing function. If available, try clock_gettime,
	and fall back to clock if it doesn't exist.
Niels Möller's avatar
Niels Möller committed
951

Niels Möller's avatar
Niels Möller committed
952
953
954
	* examples/nettle-benchmark.c (die): New function.
	(TIME_END, TIME_START): Check return value from clock_gettime.

955
956
	* gcm.h (union gcm_block): Use correct length for w array.

Niels Möller's avatar
Niels Möller committed
957
958
959
	* testsuite/gcm-test.c (test_main): Added the rest of the
	testcases from the spec.

Niels Möller's avatar
Niels Möller committed
960
2011-02-09  Niels Möller  <nisse@lysator.liu.se>
961

Niels Möller's avatar
Niels Möller committed
962
963
964
965
966
967
968
969
970
971
	* testsuite/gcm-test.c (test_main): Enabled testcases 5 and 6,
	with different IV lengths.

	* gcm-aes.c (gcm_aes_set_iv): Updated for gcm_set_iv change.

	* gcm.c (gcm_hash_sizes): New function.
	(gcm_set_iv): Added support for IVs of arbitrary size. Needed
	another argument, for the hash subkey.
	(gcm_digest): Use gcm_hash_sizes.

Niels Möller's avatar
Niels Möller committed
972
973
974
975
976
977
978
979
980
	* examples/nettle-benchmark.c (time_gmac): Use gcm_aes interface.

	* testsuite/gcm-test.c (test_gcm_aes): New function, replacing
	test_cipher_gcm and using the new gcm_aes interface.
	(test_main): Updated to use test_gcm_aes.
	* testsuite/testutils.c (test_cipher_gcm): Deleted function.

	* Makefile.in (nettle_SOURCES): Added gcm-aes.c.

981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
	* gcm.c (gcm_set_key): Replaced context argument by a struct
	gcm_key *.
	(gcm_hash): Replaced context argument by a struct gcm_key * and a
	pointer to the hashing state block.
	(gcm_auth): Added struct gcm_key * argument.
	(gcm_encrypt): Likewise.
	(gcm_decrypt): Likewise.
	(gcm_digest): Likewise.

	* gcm-aes.c: New file.
	(gcm_aes_set_key): New function.
	(gcm_aes_set_iv): Likewise.
	(gcm_aes_auth): Likewise.
	(gcm_aes_encrypt): Likewise.
	(gcm_aes_decrypt): Likewise.
	(gcm_aes_digest): Likewise.

	* gcm.h (struct gcm_key): Moved the key-dependent and
	message-independent state to its own struct.
	(struct gcm_ctx): ... and removed it here.
	(GCM_CTX): New macro.
	(GCM_SET_KEY): Likewise.
	(GCM_AUTH): Likewise.
	(GCM_ENCRYPT): Likewise.
	(GCM_DECRYPT): Likewise.
	(GCM_DIGEST): Likewise.
	(struct gcm_aes_ctx): New struct.

Niels Möller's avatar
Niels Möller committed
1009
2011-02-08  Niels Möller  <nisse@lysator.liu.se>
1010

Niels Möller's avatar
Niels Möller committed
1011
1012
	* gcm.h (struct gcm_ctx): The hash key is now always an array,
	named h, with array size depending on GCM_TABLE_BITS.
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
	* gcm.c (gcm_gf_shift): Added a separate result argument.
	(gcm_gf_mul): Compile bitwise version only when GCM_TABLE_BITS ==
	0. Simplified interface with just two arguments pointing to
	complete blocks.
	(gcm_gf_shift_4, gcm_gf_shift_8): Renamed table-based functions, from...
	(gcm_gf_shift_chunk): ... old name.
	(gcm_gf_mul): Renamed both table-based versions and made the
	argument types compatible with the bitwise gcm_gf_mul.
	(gcm_gf_mul_chunk): ... the old name.
	(gcm_set_key): Initialize the table using adds and shifts only.
	When GCM_TABLE_BITS > 0, this eliminates the only use of the
	bitwise multiplication.
	(gcm_hash): Simplified, now that we have the same interface for
	gcm_gf_mul, regardless of table size.

1028
1029
1030
1031
	* gcm.c	(GHASH_POLYNOMIAL): Use unsigned long for this constant.
	(gcm_gf_shift_chunk): Fixed bugs for the big endian 64-bit case,
	e.g., sparc64. For both 4-bit and 8-bit tables.

1032
1033
1034
1035
	* gcm.c: Use the new union gcm_block for all gf operations.

	* gcm.h (union gcm_block): New union, used to enforce alignment.

Niels Möller's avatar
Niels Möller committed
1036
2011-02-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1037

1038
1039
1040
	* gcm.c (gcm_gf_shift_chunk) : Bug fix for little-endian 8-bit
	tables.

Niels Möller's avatar
Niels Möller committed
1041
1042
1043
1044
1045
1046
1047
	* gcm.c (gcm_gf_mul_chunk): Special case first and last iteration.
	(gcm_gf_add): New function, a special case of memxor. Use it for
	all memxor calls with word-aligned 16 byte blocks. Improves
	performance to 152 cycles/byte with no tables, 28 cycles per byte
	with 4-bit tables and 10.5 cycles per byte with 8-bit tables.

	Introduced 8-bit tables. If enabled, gives gmac performance of 19
Niels Möller's avatar
Niels Möller committed
1048
1049
1050
1051
1052
	cycles per byte (still on intel x86_64).
	* gcm.c (gcm_gf_shift_chunk): New implementation for 8-bit tables.
	(gcm_gf_mul_chunk): Likewise.
	(gcm_set_key): Generate 8-bit tables.

Niels Möller's avatar
Niels Möller committed
1053
1054
	* Makefile.in (SOURCES): Added gcmdata.c.

Niels Möller's avatar
Niels Möller committed
1055
1056
	* gcm.h (GCM_TABLE_BITS): Set to 4.

Niels Möller's avatar
Niels Möller committed
1057
2011-02-06  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1058

Niels Möller's avatar
Niels Möller committed
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
	* Makefile.in (TARGETS): Added gcmdata.
	(gcmdata): New rule.

	Introduced 4-bit tables. Gives gmac performance of 45 cycles per
	byte (still on intel x86_64).
	* gcm.c (gcm_gf_shift): Renamed. Tweaked little-endian masks.
	(gcm_rightshift): ... old name.
	(gcm_gf_mul): New argument for the output. Added length argument
	for one of the inputs (implicitly padding with zeros).
	(shift_table): New table (in 4-bit and 8-bit versions), generated
	by gcmdata.
	(gcm_gf_shift_chunk): New function shifting 4 bits at
	a time.
	(gcm_gf_mul_chunk): New function processing 4 bits at a time.
	(gcm_set_key): Generation of 4-bit key table.
	(gcm_hash): Use tables, when available.

	* gcmdata.c (main): New file.

Niels Möller's avatar
Niels Möller committed
1078
1079
1080
1081
1082
1083
1084
1085
1086
	* gcm.c (gcm_rightshift): Moved the reduction of the shifted out
	bit here.
	(gcm_gf_mul): Updated for gcm_rightshift change. Improves gmac
	performance to 181 cycles/byte.

	* gcm.c (gcm_gf_mul): Rewrote. Still uses the bitwise algorithm from the
	specification, but with separate byte and bit loops. Improves gmac
	performance a bit further, to 227 cycles/byte.

Niels Möller's avatar
Niels Möller committed
1087
1088
1089
1090
	* gcm.c (gcm_rightshift): Complete rewrite, to use word rather
	than byte operations. Improves gmac performance from 830 cycles /
	byte to (still poor) 268 cycles per byte on intel x86_64.

Niels Möller's avatar
Niels Möller committed
1091
2011-02-05  Niels Möller  <nisse@lysator.liu.se>
1092

Niels Möller's avatar
Niels Möller committed
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
	* examples/nettle-benchmark.c (time_gmac): New function.
	(main): Call time_gmac.

	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added gcm-test.c.

	* testsuite/testutils.c (test_cipher_gcm): New function,
	contributed by Nikos Mavrogiannopoulos.

	* testsuite/gcm-test.c: New file, contributed by Nikos
	Mavrogiannopoulos.

	* Makefile.in (nettle_SOURCES): Added gcm.c.
	(HEADERS): Added gcm.h.

	* gcm.c: New file, contributed by Nikos Mavrogiannopoulos.
	* gcm.h: New file, contributed by Nikos Mavrogiannopoulos.

1110
1111
1112
1113
	* macros.h (INCREMENT): New macro, moved from ctr.c. Deleted third
	argument.
	* ctr.c: Use INCREMENT macro from macros.h, deleted local version.

Niels Möller's avatar
Niels Möller committed
1114
2011-01-07  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1115

Niels Möller's avatar
Niels Möller committed
1116
1117
1118
	* testsuite/Makefile.in (check): Add ../.lib to PATH, since that's
	where w*ndows looks for dlls.

Niels Möller's avatar
Niels Möller committed
1119
1120
1121
	* testsuite/testutils.c (test_cipher_stream): More debug output on
	failure.

Niels Möller's avatar
Niels Möller committed
1122
2010-12-14  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1123
1124
1125
1126
1127
1128
1129
1130
1131

	* nettle-types.h: Deleted some unnecessary parenthesis from
	function typedefs.
	(nettle_realloc_func): Moved typedef here...
	* realloc.h: ...from here.

	* buffer.c (nettle_buffer_init_realloc): Use an explicit pointer
	for realloc argument.

Niels Möller's avatar
Niels Möller committed
1132
2010-12-07  Niels Möller  <nisse@lysator.liu.se>
1133
1134
1135

	* nettle.texinfo (Copyright): Updated info on blowfish.

Niels Möller's avatar
Niels Möller committed
1136
2010-11-26  Niels Möller  <nisse@lysator.liu.se>
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151

	Reapplied optimizations (150% speedup on x86_32) and other fixes,
	relicensing them as LGPL.
	* blowfish.c (do_encrypt): Renamed, to...
	(encrypt): ...new name.
	(F): Added context argument. Shift input explicitly, instead of
	reading individual bytes via memory.
	(R): Added context argument.
	(encrypt): Deleted a bunch of local variables. Using the context
	pointer for everything should consume less registers.
	(decrypt): Likewise.
	(initial_ctx): Arrange constants into a struct, to simplify key
	setup.
	(blowfish_set_key): Some simplification.

Simon Josefsson's avatar
Simon Josefsson committed
1152
1153
1154
1155
1156
2010-11-26  Simon Josefsson  <simon@josefsson.org>

	* blowfish.c: New version ported from libgcrypt. License changed
	from GPL to LGPL.

Niels Möller's avatar
Niels Möller committed
1157
2010-11-25  Niels Möller  <nisse@lysator.liu.se>
1158
1159
1160
1161
1162

	* Makefile.in (install-shared-nettle): Use INSTALL_DATA, which
	clears the execute permission bits.
	(install-shared-hogweed): Likewise.

Niels Möller's avatar
Niels Möller committed
1163
2010-11-16  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1164
1165
1166

	* configure.ac: Updated gmp url.

Niels Möller's avatar
Niels Möller committed
1167
2010-11-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1168
1169
1170

	* tools/misc.c (werror): Don't call exit (copy&paste-error).

Niels Möller's avatar
Niels Möller committed
1171
2010-10-26  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181

	* examples/rsa-encrypt.c (main): No extra message for bad options.

	* examples/rsa-keygen.c (main): Added long options. Deleted -?,
	and fixed handling of bad options.

	* examples/next-prime.c (main): Deleted -?, and fixed handling of
	bad options.
	* examples/random-prime.c (main): Likewise.

Niels Möller's avatar
Niels Möller committed
1182
2010-10-22  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1183
1184
1185
1186
1187
1188

	* examples/nettle-benchmark.c (main): Added long options. Deleted -?,
	and fixed handling of bad options.

	* examples/eratosthenes.c (main): Added long options. Deleted -?,
	and fixed handling of bad options. Renamed -s to -q (long option
Niels Möller's avatar
Niels Möller committed
1189
	--quiet).
Niels Möller's avatar
Niels Möller committed
1190
1191
1192
1193
1194

	* tools/pkcs1-conv.c (main): Deleted short alias -? for --help,
	and fixed handling of bad options.
	* tools/sexp-conv.c (parse_options): Likewise.

Niels Möller's avatar
Niels Möller committed
1195
2010-10-06  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215

	* memxor.c (memxor3): Optimized.
	(memxor3_common_alignment): New function.
	(memxor3_different_alignment_b): New function.
	(memxor3_different_alignment_ab): New function.
	(memxor3_different_alignment_all): New function.

	* examples/nettle-benchmark.c (time_function): Reorganized, to
	reduce overhead.
	(time_memxor): Also benchmark memxor3.

	* x86_64/memxor.asm: New file.

	* examples/nettle-benchmark.c (overhead): New global variable.
	(time_function): Compensate for call overhead.
	(bench_nothing, time_overhead): New functions.
	(time_memxor): Tweaked src size, making it an integral number of
	words.
	(main): Call time_overhead.

Niels Möller's avatar
Niels Möller committed
1216
2010-10-01  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1217
1218
1219
1220
1221
1222

	* x86_64/camellia-crypt-internal.asm (ROUND): Reordered sbox
	lookups.

	* testsuite/memxor-test.c: Also test memxor3.

Niels Möller's avatar
Niels Möller committed
1223
2010-09-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1224

Niels Möller's avatar
Niels Möller committed
1225
1226
	* configure.ac: Link in memxor.asm, if found.

Niels Möller's avatar
Niels Möller committed
1227
1228
1229
1230
1231
1232
1233
1234
	* testsuite/testutils.c (test_cipher_cbc): Print more info when
	failing.

	* testsuite/memxor-test.c (test_xor): Added verbose printout.

	* examples/nettle-benchmark.c (time_memxor): Count size of
	unsigned long as "block size" for memxor.

Niels Möller's avatar
Niels Möller committed
1235
2010-09-24  Niels Möller  <nisse@lysator.liu.se>
1236

Niels Möller's avatar
Niels Möller committed
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
	* testsuite/.test-rules.make: Added rule for memxor-test.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added memxor-test.c
	* testsuite/memxor-test.c: New file.

	* memxor.c (memxor_common_alignment): New function.
	(memxor_different_alignment): New function.
	(memxor): Optimized to do word-operations rather than byte
	operations.

	* configure.ac (HAVE_NATIVE_64_BIT): New config.h define.

1248
1249
1250
1251
1252
1253
1254
	Partial revert of 2010-09-20 changes.
	* camellia-set-encrypt-key.c (camellia_set_encrypt_key):
	Reintroduce CAMELLIA_F_HALF_INV, for 32-bit machines.
	* camellia-crypt-internal.c (CAMELLIA_ROUNDSM): Two variants,
	differing in where addition of the key is done.
	* x86/camellia-crypt-internal.asm: Moved addition of key.

Niels Möller's avatar
Niels Möller committed
1255
2010-09-22  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1256
1257
1258
1259
1260
1261

	* examples/nettle-benchmark.c (BENCH_INTERVAL): Changed unit to
	seconds.
	(time_function): Use clock_gettime with CLOCK_PROCESS_CPUTIME_ID,
	if available. This gives better accuracy, at least on recent
	linux.
Niels Möller's avatar
Niels Möller committed
1262
1263
1264
1265
1266
1267
	(BENCH_INTERVAL): Reduced to 0.1 s.
	(struct bench_memxor_info): New struct.
	(bench_memxor): New function.
	(time_memxor): New function.
	(main): Use time_memxor. Added optional argument used to limit the
	algorithms being benchmarked.
Niels Möller's avatar
Niels Möller committed
1268
1269
	(GET_CYCLE_COUNTER): Define also for x86_64.
	(time_memxor): Improved display.
Niels Möller's avatar
Niels Möller committed
1270
1271
1272
1273
1274
1275
1276

	* examples/Makefile.in (nettle-benchmark): Link using
	$(BENCH_LIBS) rather than $(LIBS).

	* configure.ac: Check for clock_gettime, and add -lrt to
	BENCH_LIBS if needed.

Niels Möller's avatar
Niels Möller committed
1277
2010-09-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296

	* configure.ac: Less quoting when invoking $CC, to allow CC="gcc
	-m32".

	* x86/camellia-crypt-internal.asm (ROUND): Adapted to new key
	convention, moving key xor to the end.

	* camellia-set-encrypt-key.c (CAMELLIA_F_HALF_INV): Deleted macro.
	(camellia_set_encrypt_key): Deleted the CAMELLIA_F_HALF_INV
	operations intended for moving the key xor into the middle of the
	round.

	* camellia-crypt-internal.c (CAMELLIA_ROUNDSM): Moved addition of
	key to the end, to use a 64-bit xor operation.

	* x86_64/camellia-crypt-internal.asm: New file.

	* x86_64/machine.m4 (LREG, HREG, XREG): New macros.

Niels Möller's avatar
Niels Möller committed
1297
2010-09-17  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1298
1299
1300
1301

	* configure.ac: Support shared libraries (dlls) with mingw32.
	Contributed by David Hoyt.

Niels Möller's avatar
Niels Möller committed
1302
2010-07-25  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1303

1304
1305
	* configure.ac: Changed version number to nettle-2.2.

1306
1307
	* Released nettle-2.1.

Niels Möller's avatar
Niels Möller committed
1308
	* configure.ac: Use camellia-crypt-internal.asm, if available.
1309
1310
	Bumped soname to libnettle.so.4, and reset LIBNETTLE_MINOR to
	zero.
Niels Möller's avatar
Niels Möller committed
1311

Niels Möller's avatar
Niels Möller committed
1312
	* x86/machine.m4 (LREG, HREG): Moved macros here, from...
Niels Möller's avatar
Niels Möller committed
1313
1314
1315
1316
	* x86/aes.m4: ...here.

	* x86/camellia-crypt-internal.asm: New file.

Niels Möller's avatar
Niels Möller committed
1317
1318
1319
1320
	* nettle.texinfo: Updated and expanded section on DSA.
	Document aes_invert_key, and camellia. Added missing functions
	rsa_sha512_verify and rsa_sha512_verify_digest.

1321
	* camellia.h (struct camellia_ctx): Eliminate the two unused
Niels Möller's avatar
Niels Möller committed
1322
	subkeys, and renumber the remaining ones.
1323
1324
1325
1326
1327
	* camellia-crypt-internal.c (_camellia_crypt): Updated for
	renumbered subkeys.
	* camellia-set-encrypt-key.c (camellia_set_encrypt_key): Likewise.
	* camellia-set-decrypt-key.c (camellia_invert_key): Likewise.

Niels Möller's avatar
Niels Möller committed
1328
1329
1330
1331
1332
1333
	* camellia-set-encrypt-key.c (camellia_set_encrypt_key): Inline
	the expansion of camellia_setup128 and camellia_setup256, keeping
	the unexpanded key in scalar variables.
	(camellia_setup128): Deleted.
	(camellia_setup256): Deleted.

Niels Möller's avatar
Niels Möller committed
1334
2010-07-24  Niels Möller  <nisse@lysator.liu.se>
1335

Niels Möller's avatar
Niels Möller committed
1336
1337
1338
1339
	* camellia-set-encrypt-key.c (camellia_set_encrypt_key): Reduced
	code size, no complete loop unroll. Use one loop for each phase of
	the post-processing.

Niels Möller's avatar
Niels Möller committed
1340
1341
1342
	* testsuite/camellia-test.c: New tests for camellia_invert_key.
	* testsuite/aes-test.c: New tests for aes_invert_key.

1343
1344
1345
1346
1347
1348
	* aes.h (aes_invert_key): Declare it.

	* aes-set-decrypt-key.c (aes_invert_key): New function, key
	inversion code extracted from aes_set_decrypt_key.
	(aes_set_decrypt_key): Use aes_invert_key.

1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
	* camellia-set-encrypt-key.c (camellia_setup128): Generate
	unmodified subkeys according to the spec. Moved clever combination
	of subkeys to camellia_set_encrypt_key.
	(camellia_setup256): Likewise.
	(camellia_set_encrypt_key): Moved subkey post-processing code
	here, and reduce code duplication between 128-bit keys and larger
	keys.

	* camellia.c: Deleted file, split into several new files...
	* camellia-table.c (_camellia_table): New file with the constant
	sbox tables.
	* camellia-set-encrypt-key.c: New file.
	(camellia_setup128): Generate unmodified subkeys according to the
	spec. Moved clever combination of subkeys to camellia_set_encrypt_key.
	(camellia_setup256): Likewise.

	* camellia-set-decrypt-key.c: New file.
	(camellia_invert_key): Key inversion function.
	(camellia_set_decrypt_key): New key setup function.
	* camellia-internal.h: New file.
	* camellia-crypt.c (camellia_crypt): New file, new wrapper
	function passing the sbox table to _camellia_crypt.
	* camellia-crypt-internal.c (_camellia_crypt): New file, with main
	encrypt/decrypt function.
Niels Möller's avatar
Niels Möller committed
1373
	* Makefile.in (nettle_SOURCES): Updated list of camellia source files.
1374
	(DISTFILES): Added camellia-internal.h.
Niels Möller's avatar
Niels Möller committed
1375

Niels Möller's avatar
Niels Möller committed
1376
2010-07-20  Niels Möller  <nisse@lysator.liu.se>
1377

1378
1379
	* camellia-meta.c: Use _NETTLE_CIPHER_SEP_SET_KEY.

1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
	* camellia.h (struct camellia_ctx): Replaced flag camellia128 by
	expanded key length nkeys.

	* camellia.c (camellia_set_encrypt_key): Renamed, from...
	(camellia_set_key): ... old name.
	(camellia_invert_key): New function.
	(camellia_set_decrypt_key): New function, using
	camellia_invert_key.
	(camellia_crypt): Renamed, from...
	(camellia_encrypt): ... old name.
	(camellia_decrypt): Deleted, no longer needed. camellia_crypt used
	for both encryption and decryption.

Niels Möller's avatar
Niels Möller committed
1393
1394
1395
1396
	* nettle-meta.h (_NETTLE_CIPHER_SEP_SET_KEY): New macro.

	* dsa-keygen.c: Removed unnecessary include of memxor.h.

1397
1398
1399
1400
1401
1402
1403
	* camellia.c: Rewrote to use 64-bit type for subkeys and use
	64-bit operations throughout. Performance on x86_32, when compiled
	with gcc-4.4.4, is reduced by roughly 15%, this should be fixed
	later.

	* camellia.h (struct camellia_ctx): Use type uint64_t for subkeys.

Niels Möller's avatar
Niels Möller committed
1404
2010-07-07  Niels Möller  <nisse@lysator.liu.se>
1405

1406
1407
1408
1409
1410
1411
1412
	* aes.h (aes_encrypt, aes_decrypt): Declare ctx argument as const.
	Also updated implementation.
	* blowfish.h (blowfish_encrypt, blowfish_decrypt): Likewise.
	* cast128.h (cast128_encrypt, cast128_decrypt): Likewise.
	* serpent.h (serpent_encrypt, serpent_decrypt): Likewise.
	* twofish.h (twofish_encrypt, twofish_decrypt): Likewise.

Niels Möller's avatar
Niels Möller committed
1413
1414
1415
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added
	camellia-test.c.

Niels Möller's avatar
Niels Möller committed
1416
1417
	* examples/nettle-benchmark.c: Added camellia ciphers.

1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
	* Makefile.in (nettle_SOURCES): Added camellia.c and
	camellia-meta.c.
	(HEADERS): Added camellia.h.

	* nettle-meta.h (nettle_camellia128): Declare.
	(nettle_camellia192): Likewise.
	(nettle_camellia256): Likewise.

	* camellia-meta.c: New file.

	* camellia.h: Rewrote interface to match nettle conventions.

	* camellia.c: Converted to nettle conventions.
	(camellia_encrypt128, camellia_encrypt256): Unified to new
	function...
	(camellia_encrypt): ...New function, with a loop doing 6
	regular rounds, one FL round and one FLINV round per iteration,
	with iteration count depending on the key size.

	(camellia_decrypt128, camellia_decrypt256): Similarly unified
	as...
	(camellia_decrypt): ...New function, analogous to
	camellia_encrypt.

Niels Möller's avatar
Niels Möller committed
1442
2010-07-06  Niels Möller  <nisse@lysator.liu.se>
1443
1444
1445
1446
1447
1448

	* camellia.c, camellia.h: New files, copied from
	http://info.isl.ntt.co.jp/crypt/eng/camellia/dl/camellia-LGPL-1.2.0.tar.gz.

	* testsuite/camellia-test.c: New file.

Niels Möller's avatar
Niels Möller committed
1449
2010-07-05  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476

	* nettle.texinfo: Document new conventions for weak key and des
	parity checks. Document des_check_parity.

	* testsuite/des-test.c (test_weak): Don't check the deleted status
	attribute.

	* des-compat.c (des_key_sched): Rewrote error checking logic for
	the case of non-zero des_check_key.

	* des3.c (des3_set_key): Changed weak key detection logic.
	Complete key setup also for weak keys, and don't set the status
	attribute.

	* des.c (des_set_key): New iteration logic, to keep key pointer
	unchanged. Moved weak key check to the end, and don't set the
	status attribute.
	(des_encrypt): Ignore status attribute.
	(des_decrypt): Likewise.

	* des.h (enum des_error): Deleted.
	(struct des_ctx): Deleted status attribute.
	(struct des3_ctx): Likewise.

	* blowfish.c (initial_ctx): Deleted status value.
	(blowfish_encrypt): Ignore status attribute.
	(blowfish_decrypt): Likewise.
1477
	(blowfish_set_key): Return result from weak key check, without
Niels Möller's avatar
Niels Möller committed
1478
1479
1480
1481
1482
1483
1484
	setting the status attribute.

	* blowfish.h (enum blowfish_error): Deleted.
	(struct blowfish_ctx): Deleted status attribute.

	* Makefile.in (des_headers): Deleted parity.h.

Niels Möller's avatar
Niels Möller committed
1485
2010-06-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1486

Niels Möller's avatar
Niels Möller committed
1487
1488
1489
1490
1491
1492
	* testsuite/des-test.c (test_des): New function.
	(test_weak): New function.
	(test_main): Use test_des and test_weak. Added tests for all the
	weak keys. Added some tests with invalid (to be ignored) parity
	bits.

Niels Möller's avatar
Niels Möller committed
1493
1494
1495
1496
1497
1498
1499
1500
	* des.c (parity_16): New smaller parity table.
	(des_check_parity): New function.
	(des_fix_parity): Use parity_16.
	(des_weak_p): New weak-key detection. Ignores parity bits, and
	uses a hash table.
	(des_set_key): Deleted parity checking code. Replaced old weak-key
	detection code by a call to des_weak_p.

Niels Möller's avatar
Niels Möller committed
1501
2010-06-04  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
<