ChangeLog 234 KB
Newer Older
1 2
2013-04-11  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
3 4 5
	* examples/nettle-benchmark.c (time_umac): New function.
	(main): Call it.

6 7 8 9 10 11 12 13 14
	* umac-set-key.c (_umac_set_key): Drop byteswapping of l3_key2, it
	can be xored directly to the pad in native byteorder.
	* umac-l3.c (_umac_l3): Drop key_2 argument, let caller do that
	xor. Updated all callers.
	* umac32.c (umac32_digest): Adapt to l3 changes.
	* umac64.c (umac64_digest): Likewise.
	* umac96.c (umac96_digest): Likewise.
	* umac128.c (umac128_digest): Likewise.

Niels Möller's avatar
Niels Möller committed
15 16 17 18 19 20 21 22 23 24 25 26 27
	Initial implementation of umac.
	* umac.h: New file.
	* umac-nh.c: New file.
	* umac-nh-n.c: New file.
	* umac-poly64.c: New file.
	* umac-poly128.c: New file.
	* umac-l2.c: New file.
	* umac-l3.c: New file.
	* Makefile.in (nettle_SOURCES): Added umac source files.
	(HEADERS): Added umac.h.
	* testsuite/umac-test.c: New file.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added umac-test.c.

28 29 30 31 32 33
	* ecc-mul-a.c (ecc_mul_a): Avoid using mp_bitcnt_t, for
	compatibility with older GMP versions.
	* ecc-mul-g.c (ecc_mul_g): Likewise.
	* eccdata.c (ecc_mul_binary): Likewise.
	* sec-modinv.c (sec_modinv): Likewise.

34 35 36
	* x86_64/sha3-permute.asm: Go via memory for moves between general
	registers and xmm registers.

37 38 39 40 41 42
2013-04-06  Niels Möller  <nisse@lysator.liu.se>

	From Edgar E. Iglesias:
	* sha3.c (_sha3_update): Fix condition for when the block buffer
	is full.

43 44
2013-04-04  Niels Möller  <nisse@lysator.liu.se>

45 46 47
	* ecc-point.c (ecc_point_get): Allow NULL x or y, ignore
	corresponding coordinate.

48 49 50
	* nettle.texinfo (Elliptic curves): Document high-level ECDSA
	support.

51 52 53
	From Martin Storsjö. Fallback functions for older GMP releases.
	* gmp-glue.c (mpn_copyd, mpn_copyi, mpn_zero): New functions.
	* gmp-glue.h: Declare them.
54
	(mpn_sqr): Fallback macro.
55

56 57 58 59 60 61 62 63 64
	* gmp-glue.h (cnd_add_n, cnd_sub_n): Moved here, define in terms
	of mpn_cnd_add_n and mpn_sub_n if available, otherwise in terms of
	mpn_addmul_1 and mpn_submul_1. This seems to be an improvement for
	subtraction, but more questionable for addition.

	* ecc-internal.h: Include gmp-glue.h. Deleted corresponding
	include in all files using ecc-internal.h.
	(cnd_add_n, cnd_sub_n): Moved from here.

Niels Möller's avatar
Niels Möller committed
65 66
2013-04-03  Niels Möller  <nisse@lysator.liu.se>

67 68 69 70 71 72
	* ecc-point-mul-g.c (ecc_point_mul_g): New file and function.
	* ecc-point-mul.c (ecc_point_mul): New file and function.
	* ecc.h: Updated declarations and name mangling.
	* Makefile.in (hogweed_SOURCES): Added ecc-point-mul.c and
	ecc-point-mul-g.c.

Niels Möller's avatar
Niels Möller committed
73 74 75
	* testsuite/salsa20-test.c (test_main): Tests for salsa20r12,
	contributed by Nikos Mavrogiannopoulos.

Niels Möller's avatar
Niels Möller committed
76 77 78 79
2013-03-26  Niels Möller  <nisse@lysator.liu.se>

	* armv7/salsa20-core-internal.asm: New file. 45% speedup.

80 81
2013-03-25  Niels Möller  <nisse@lysator.liu.se>

82 83 84 85 86 87 88 89 90 91
	From Martin Storsjö:
	* examples/timing.c: New file, extracted from nettle-benchmark.c.
	* examples/timing.h: New file.
	* examples/Makefile.in (SOURCES): Added timing.c.
	(DISTFILES): Added timing.h.
	(BENCH_OBJS, ECC_BENCH_OBJS, HOGWEED_BENCH_OBJS): Added timing.o.
	* examples/nettle-benchmark.c: Use timing.h.
	* examples/hogweed-benchmark.c: Likewise.
	* examples/ecc-benchmark.c: Likewise.

Niels Möller's avatar
Niels Möller committed
92 93 94 95 96
	From Nikos Mavrogiannopoulos:
	* salsa20r12-crypt.c (salsa20r12_crypt): New file and function.
	* salsa20.h (salsa20r12_crypt): Declare.
	* Makefile.in (nettle_SOURCES): Added salsa20r12-crypt.c.

97
	From Martin Storsjö:
98 99
	* examples/hogweed-benchmark.c: Include local headers.
	* testsuite/ecdsa-keygen-test.c: Likewise.
100
	* x86_64/sha3-permute.asm: Workaround for Apple's assembler; write
101
	movq instructions as movd.
102

103 104 105
	* Makefile.in (hogweed_PURE_OBJS): Don't include OPT_ASM_SOURCES
	twice.

Niels Möller's avatar
Niels Möller committed
106 107
2013-03-15  Niels Möller  <nisse@lysator.liu.se>

108 109
	* armv7/sha3-permute.asm: New file. 4.5 time speedup.

Niels Möller's avatar
Niels Möller committed
110 111
	* armv7/machine.m4 (QREG): New macro.

Niels Möller's avatar
Niels Möller committed
112 113
2013-03-14  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
114 115 116 117
	* configure.ac (asm_replace_list): Added sha3-permute.asm,
	revering 2012-12-30 change. 34% speedup on intel i5, from 2190
	cycles for the C implementation down to 1630.

Niels Möller's avatar
Niels Möller committed
118 119 120
	* armv7/sha512-compress.asm: Optimized. Keep expanded data in
	registers, exploit parallelism. Another 70% speedup.

Niels Möller's avatar
Niels Möller committed
121 122 123
	* testsuite/sha512-test.c (test_main): Additional test vectors,
	including some longer than 128 bytes.

Niels Möller's avatar
Niels Möller committed
124 125
2013-03-13  Niels Möller  <nisse@lysator.liu.se>

126 127 128
	* armv7/sha512-compress.asm: New file, using neon instructions.
	2.3 time speedup.

Niels Möller's avatar
Niels Möller committed
129 130 131 132
	* configure.ac (asm_replace_list): Added sha512-compress.asm.
	* x86_64/machine.m4 (OFFSET64): New macro.
	* x86_64/sha512-compress.asm: New file, 20% speedup.

133 134 135
	* sha512-compress.c (ROUND): Eliminated a temporary, analogous to
	sha256 change below.

Niels Möller's avatar
Niels Möller committed
136 137 138
	* x86_64/sha256-compress.asm: New file, 16% speedup (benchmarked
	on intel i5).

139 140
2013-03-11  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
141 142 143 144
	* armv7/sha256-compress.asm: New file, 25% speedup.

	* configure.ac (asm_replace_list): Added sha256-compress.asm.

145 146
	* sha256-compress.c (ROUND): Eliminated a temporary.

Niels Möller's avatar
Niels Möller committed
147 148
	* armv7/sha1-compress.asm: New file, 9% speedup.

149 150 151
	* testsuite/testutils.c (test_hash): Test different alignments for
	the hash input.

Niels Möller's avatar
Niels Möller committed
152 153 154 155 156 157
2013-03-08  Niels Möller  <nisse@lysator.liu.se>

	* armv7/aes-decrypt-internal.asm: New file, 15% speedup.
	* armv7/aes-encrypt-internal.asm: New file, 25% speedup.
	* armv7/aes.m4: New file.

158 159
2013-03-07  Niels Möller  <nisse@lysator.liu.se>

160 161
	* gmp-glue.c (mpz_limbs_cmp): Don't use PTR and SIZ macros.

Niels Möller's avatar
Niels Möller committed
162 163 164 165 166 167 168 169 170 171 172 173
	* Makefile.in (aesdata, desdata, twofishdata, shadata, gcmdata)
	(eccdata): Arrange for compiling these programs for running on the
	build system, also when cross compiling everything else.

	* config.make.in (CC_FOR_BUILD, EXEEXT_FOR_BUILD): New variables.

	* configure.ac: Use GMP_PROG_CC_FOR_BUILD and
	GMP_PROG_EXEEXT_FOR_BUILD.

	* aclocal.m4 (GMP_PROG_CC_FOR_BUILD, GMP_PROG_CC_FOR_BUILD_WORKS)
	(GMP_PROG_EXEEXT_FOR_BUILD): New macros, based on GMP's.

174 175 176 177 178 179 180 181 182 183 184 185 186 187
	* aesdata.c: Deleted includes of config.h and nettle-types.h. Use
	unsigned char and unsigned long instead of stdint.h types.

	* desdata.c: Deleted includes of config.h and desCode.h.
	(main): Return 1 on invalid argument. Don't use ROR macro. Use
	unsigned long instead of uint32_t, and make it work if unsigned
	long is larger than 32 bits.

	* gcmdata.c: Deleted include of config.h and use UNUSED macro.
	* shadata.c: Likewise.

	* twofishdata.c: Deleted include of nettle-types.h. Use unsigned
	char instead of stdint.h types.

188 189
	* x86_64/ecc-521-modp.asm: New file. 2.4 time speedup.

190 191
2013-03-06  Niels Möller  <nisse@lysator.liu.se>

192
	* x86_64/ecc-384-modp.asm: New file, 3 time speedup.
193
	* x86_64/ecc-256-redc.asm: New file, 2.5 time speedup.
194 195 196
	* x86_64/ecc-224-modp.asm: New file, 5 time speedup over C
	version.

Niels Möller's avatar
Niels Möller committed
197 198 199 200 201 202 203
2013-03-05  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac (asm_optional_list): Added ecc-521-modp.asm.
	* ecc-521.c: Check HAVE_NATIVE_ecc_521_modp, and use native
	version if available.
	* armv7/ecc-521-modp.asm: New file, 2 time speedup over C version.

Niels Möller's avatar
Niels Möller committed
204 205 206 207 208 209 210 211
2013-03-04  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac (asm_optional_list): Added ecc-384-modp.asm. Deleted
	bogus reference to $asm_search_list.
	* ecc-384.c: Check HAVE_NATIVE_ecc_384_modp, and use native
	version if available.
	* armv7/ecc-384-modp.asm: New file, 3 time speedup over C version.

212 213 214 215
2013-03-03  Niels Möller  <nisse@lysator.liu.se>

	* ecc-256.c: Fixed definition of USE_REDC.

216 217
2013-03-01  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
218 219 220 221
	* ecc-256.c: Check HAVE_NATIVE_ecc_256_redc, and use native
	version if available.
	* armv7/ecc-256-redc.asm: New file, 4 time speedup over C version.

222 223
	* testsuite/ecc-redc-test.c: Increased test count.

Niels Möller's avatar
Niels Möller committed
224 225 226 227 228
	* ecc-224.c: Check HAVE_NATIVE_ecc_224_modp, and use native
	version if available.
	* armv7/ecc-224-modp.asm: New file, 4.5 time speedup over C
	version.

229 230 231
	* configure.ac (asm_optional_list): Added ecc-224-modp.asm.
	(OPT_ASM_SOURCES): Fixed assignment.

Niels Möller's avatar
Niels Möller committed
232 233
2013-02-28  Niels Möller  <nisse@lysator.liu.se>

234 235 236
	* x86_64/ecc-192-modp.asm: Reorganized to reduce number of
	additions. Use setc instruction.

237 238 239
	* examples/Makefile.in: Let $(HOGWEED_TARGETS) depend on
	../libhogweed.a.

Niels Möller's avatar
Niels Möller committed
240 241 242
	* armv7/ecc-192-modp.asm: New file. 2.5 time speedup over C
	version.

243 244
2013-02-27  Niels Möller  <nisse@lysator.liu.se>

245 246
	* ecc-192.c: Check HAVE_NATIVE_ecc_192_modp, and use native
	version if available.
Niels Möller's avatar
Niels Möller committed
247
	(ecc_192_modp): Fixed carry handling bug in 32-bit version.
248

Niels Möller's avatar
Niels Möller committed
249 250
	* x86_64/ecc-192-modp.asm: New file. 3.8 times speedup over C
	version.
251

252 253 254 255 256 257 258 259
	* configure.ac (OPT_ASM_SOURCES): New substituted variable.
	(asm_replace_list, asm_optional_list): New variables. For files in
	asm_optional_list, also add them to OPT_ASM_SOURCES and define
	appropriate HAVE_NATIVE_* symbols found.

	* Makefile.in (OPT_ASM_SOURCES): New variable. Used for setting
	hogweed_OBJS and hogweed_PURE_OBJS.

260 261
	* testsuite/ecc-mod-test.c: Increased test count.

262 263 264
	* ecc-384.c (ecc_384_modp): Fixed typo which broke carry handling
	in the 64-bit version.

Niels Möller's avatar
Niels Möller committed
265 266 267
	* examples/ecc-benchmark.c (bench_add_jjj): Typo fix, benchmark
	the right function.

268 269 270 271 272 273
	* gmp-glue.h: Check if GMP provides mpz_limbs_read (expected in
	next release).
	* gmp-glue.c: Use GMP's mpz_limbs_read and friends if available.
	Renamed all functions for consistency with GMP. Updated all
	callers.

274 275
2013-02-20  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
276 277 278 279 280 281 282
	* examples/Makefile.in (HOGWEED_TARGETS): Added
	hogweed-benchmark$(EXEEXT).
	(SOURCES): Added hogweed-benchmark.c.
	(hogweed-benchmark$(EXEEXT)): New target.

	* examples/hogweed-benchmark.c: New file.

283 284 285 286 287 288
	* ecdsa-keygen.c (ecdsa_generate_keypair): New file and function.
	* Makefile.in (hogweed_SOURCES): Added ecdsa-keygen.c.
	* testsuite/ecdsa-keygen-test.c: New testcase.
	* testsuite/Makefile.in (TS_HOGWEED_SOURCES): Added
	ecdsa-keygen-test.c.

289 290
	* nettle-internal.h (TMP_ALLOC): Added missing parentheses.

291 292
2013-02-18  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
293 294 295 296 297 298
	* testsuite/ecdsa-verify-test.c: New testcase.
	* testsuite/ecdsa-sign-test.c: New testcase.
	* testsuite/Makefile.in (TS_HOGWEED_SOURCES): Added
	ecdsa-sign-test.c and ecdsa-verify-test.c.
	* testsuite/testutils.h: Include ecdsa.h.
	(SHEX): Deleted const cast.
299

300 301 302 303 304 305 306 307 308 309 310 311 312 313 314
	* ecc-point.c: New file, struct ecc_point abstraction.
	* ecc-scalar.c: New file, struct ecc_scalar abstraction.
	* ecc-random.c (ecc_modq_random, ecc_scalar_random): New file, new
	functions.
	* ecc-hash.c (ecc_hash): New file and function.
	* ecc-ecdsa-sign.c: New file, low-level signing interface.
	* ecc-ecdsa-verify.c: New file, low-level ecdsa verify.
	* ecdsa-sign.c: (ecdsa_sign): New file and function.
	* ecdsa-verify.c (ecdsa_verify): New file and function.
	* ecdsa.h: New header file.
	* ecc.h: Declare ecc_point and ecc_scalar functions.
	* ecc-internal.h: Added declarations.
	* Makefile.in (hogweed_SOURCES): Added new source files.
	(HEADERS): Added ecdsa.h.

Niels Möller's avatar
Niels Möller committed
315 316 317 318 319 320
	* gmp-glue.c (_mpz_set_mpn): New convenience function.
	(_mpn_set_base256): New function.
	(_gmp_alloc_limbs): New function.
	(_gmp_free_limbs): New function.
	* gmp-glue.h: Corresponding declarations. Include nettle-stdinh.h.

321 322 323 324 325 326 327
	* examples/Makefile.in (HOGWEED_TARGETS): Renamed, was
	RSA_TARGETS. Added ecc-benchmark$(EXEEXT).
	(SOURCES): Added ecc-benchmark.c.
	(ecc-benchmark$(EXEEXT)): New target.

	* examples/ecc-benchmark.c: New file, benchmarking ecc primitives.

328 329
2013-02-15  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
330 331 332 333 334 335 336 337 338
	Integrate ecc_mul_a.
	* ecc-a-to-j.c: New file.
	* ecc-add-jjj.c: New file.
	* ecc-mul-a.c: New file.
	* Makefile.in (hogweed_SOURCES): Added new files.
	* testsuite/ecc-mul-a-test.c: New file.
	* testsuite/Makefile.in (TS_HOGWEED_SOURCES): Added
	ecc-mul-a-test.c.

339 340 341
	* testsuite/testutils.c: Removed redundant includes.
	(die): New function.

Niels Möller's avatar
Niels Möller committed
342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361
	Integrate ecc_mul_g.
	* ecc.h: New file.
	* ecc-j-to-a.c: New file.
	* ecc-size.c: New file.
	* ecc-add-jja.c: New file.
	* ecc-dup-jj.c: New file.
	* ecc-mul-g.c: New file.
	* sec-tabselect.c: New file.
	* Makefile.in (hogweed_SOURCES): Added new files.
	(HEADERS): Added ecc.h
	* testsuite/ecc-mul-g-test.c: New file.
	* testsuite/Makefile.in (TS_HOGWEED_SOURCES): Added
	ecc-mul-g-test.c.
	* testsuite/testutils.c (xalloc_limbs): New function.
	(test_mpn): New function.
	(test_ecc_point): New function.
	(test_ecc_mul_a): New function.
	(test_ecc_mul_j): New function.
	* testsuite/testutils.h: Corresponding declarations.

Niels Möller's avatar
Niels Möller committed
362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391
	Integrate ECC internals.
	* ecc-curve.h: New file.
	* ecc-internal.h: New file.
	* cnd-copy.c: New file.
	* ecc-192.c: New file.
	* ecc-224.c: New file.
	* ecc-256.c: New file.
	* ecc-384.c: New file.
	* ecc-521.c: New file.
	* ecc-generic-modp.c: New file.
	* ecc-generic-modq.c: New file.
	* ecc-generic-redc.c: New file.
	* ecc-mod.c: New file.
	* ecc-modp.c: New file.
	* ecc-modq.c: New file.
	* sec-add-1.c: New file.
	* sec-modinv.c: New file.
	* sec-sub-1.c: New file.
	* Makefile.in (hogweed_SOURCES): Added new files.
	(HEADERS): Added ecc-curve.h.
	(DISTFILES): Added ecc-internal.h.
	* testsuite/ecc-mod-test.c: New file.
	* testsuite/ecc-modinv-test.c: New file.
	* testsuite/ecc-redc-test.c: New file.
	* testsuite/testutils.c (ecc_curves): New constant array.
	* testsuite/testutils.h: Include ecc-related headers. Declare
	ecc_curves array.
	* testsuite/Makefile.in (TS_HOGWEED_SOURCES): Added ecc-mod-test.c
	ecc-modinv-test.c ecc-redc-test.c.

392 393 394 395
	* gmp-glue.c: New file, mpn <-> mpz conversions.
	* gmp-glue.h: New file.
	* Makefile.in: Added to hogweed_SOURCES and DISTFILES, respectively.

396 397 398 399
	* eccdata.c: New program, for generating ECC-related tables.
	* Makefile.in (ecc-192.h, ecc-224.h, ecc-256.h, ecc-384.h)
	(ecc-512.h): New generated files.

Niels Möller's avatar
Niels Möller committed
400 401
2013-02-19  Niels Möller  <nisse@lysator.liu.se>

402 403 404
	* armv7/memxor.asm (memxor): Software pipelining for the aligned
	case. Runs at 6 cycles (0.5 cycles per byte). Delayed push of
	registers until we know how many registers we need.
Niels Möller's avatar
Niels Möller committed
405
	(memxor3): Use 3-way unrolling also for aligned memxor3.
406
	Runs at 8 cycles (0.67 cycles per byte)
Niels Möller's avatar
Niels Möller committed
407

408 409
2013-02-14  Niels Möller  <nisse@lysator.liu.se>

410 411 412
	* configure.ac: Find GMP's GMP_NUMB_BITS. Substitute in Makefile.
	* config.make.in (GMP_NUMB_BITS): New variable.

413 414 415 416
	* examples/rsa-keygen.c (uint_arg): New function.
	(main): New options -s and -e, to specify key size and public
	exponent. Increased default key size to 2048.

417 418 419 420 421
2013-02-12  Niels Möller  <nisse@lysator.liu.se>

	* armv7/memxor.asm (memxor): Optimized aligned case, using 3-way
	unrolling.

422 423
2013-02-06  Niels Möller  <nisse@lysator.liu.se>

424 425
	* armv7/memxor.asm (memxor, memxor3): Optimized aligned case, now
	runs at 0.75 cycles/byte.
426

427 428 429 430
	* armv7/README: New file.
	* armv7/machine.m4: New (empty) file.
	* armv7/memxor.asm: Initial assembly implementation.

431 432
	* config.m4.in: Substitute ASM_TYPE_PROGBITS as TYPE_PROGBITS.

433 434 435 436 437 438 439 440 441 442
	* config.make.in: Added .s to the suffix list.

	* Makefile.in (.asm.s): Use a separate make target for .asm
	preprocessing. Include asm.d, which the corresponding
	dependencies.

	* configure.ac (asm_file_list): Collect assembly files into this
	variable.
	(asm.d): Make config.status write dependencies for .s files into
	asm.d.
443
	(ASM_ALIGN_LOG): Set to "no" when appropriate.
444 445 446 447
	(ASM_TYPE_FUNCTION): Default to "@function".
	(ASM_TYPE_PROGBITS): New substituted variable, set in the same way
	as ASM_TYPE_FUNCTION.
	(ASM_MARK_NOEXEC_STACK): Use TYPE_PROGBITS.
448
	(asm_path): Set up asm_path for armv7.
449

450 451 452
	* asm.m4: Use changecom to disable m4 quoting. Use divert to
	suppress output.

453 454 455 456 457 458 459
2013-02-05  Niels Möller  <nisse@lysator.liu.se>

	* testsuite/rsa-keygen-test.c (test_main): Updated expected
	signatures, after the nettle_mpz_random change below.
	* testsuite/dsa-test.c (test_main): Likewise. Also fixed the
	dsa256 test to actually use the expected signature.

460 461 462 463 464
2013-01-31  Niels Möller  <nisse@lysator.liu.se>

	* bignum-random.c (nettle_mpz_random): Increased number of extra
	bits to 64, following FIPS 186-3.

465 466 467 468
2013-01-12  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac: Use AC_LANG_SOURCE.

469 470
2013-01-02  Niels Möller  <nisse@lysator.liu.se>

471 472 473
	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.5.
	(LIBHOGWEED_MINOR): And to 2.3.

474 475 476 477 478
	* examples/Makefile.in: Explicit rules for building objects in
	parent directory.
	* tools/Makefile.in: Likewise.
	* testsuite/Makefile.in: Likewise.

479 480
2013-01-01  Niels Möller  <nisse@lysator.liu.se>

481 482 483
	* nettle.texinfo (Recommended hash functions): Document additional
	sha3 functions.

484 485 486
	* examples/nettle-benchmark.c (main): Benchmark additional sha3
	functions.

487 488
2012-12-30  Niels Möller  <nisse@lysator.liu.se>

489 490 491 492 493 494 495 496 497 498 499 500 501
	* sha3-224.c, sha3-224-meta.c: New files.
	* sha3-384.c, sha3-384-meta.c: New files.
	* sha3-512.c, sha3-512-meta.c: New files.
	* sha3.h: Prototypes for sha3 with sizes 224, 384 and 512.
	* nettle-meta.h: Declare nettle_sha3_224, nettle_sha3_384 and
	nettle_sha3_512.
	* Makefile.in (nettle_SOURCES): Added new sha3 files.

	* testsuite/sha3-224-test.c: New file.
	* testsuite/sha3-384-test.c: New file.
	* testsuite/sha3-512-test.c: New file.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added new sha3 test files.

502 503
	* configure.ac: Disabled use of sha3-permute.asm.

504 505 506 507 508 509 510 511
2012-12-20  Niels Möller  <nisse@lysator.liu.se>

	From Tim Rühsen:
	* testsuite/des-compat-test.c (pt): Use proper prototype, use
	const.
	* testsuite/testutils.c (test_dsa_key): Deleted spurious
	semicolon.

512 513
2012-12-15  Niels Möller  <nisse@lysator.liu.se>

514 515 516 517 518 519
	Based on a patch from Alon Bar-Lev:
	* Makefile.in (LIBTARGETS, SHLIBTARGET): Define as empty if static
	or shared libraries, respectively, are disabled.
	(TARGETS): Deleted @IF_SHARED@ conditional, now in the definition
	of SHLIBTARGET.

520
	From Alon Bar-Lev:
521
	* configure.ac: Check for ar program. New option --disable-static.
522 523
	* config.make.in (AR): Use configured value.

524 525 526
2012-12-13  Niels Möller  <nisse@lysator.liu.se>

	* x86_64/sha3-permute.asm: Rewrote, to keep all state in
Niels Möller's avatar
Niels Möller committed
527
	registers. 2400 cycles on x86_64, only slightly faster than the
528 529
	current C code.

530 531 532 533 534
2012-12-09  Niels Möller  <nisse@lysator.liu.se>

	* sha3-permute.c (sha3_permute): Rewrote to do permutation in
	place. 80% speedup on x86_64, 2500 cycles.

535 536 537 538 539 540 541 542 543 544 545
2012-12-04  Niels Möller  <nisse@lysator.liu.se>

	* ctr.c (ctr_crypt): Fix bug reported by Tim Kosse. Don't
	increment the counter when length is zero (was broken for the
	in-place case).

	* testsuite/ctr-test.c (test_main): Added test with zero-length
	data.
	* testsuite/testutils.c (test_cipher_ctr): Check the ctr value
	after encrypt and decrypt.

546 547
2012-12-03  Niels Möller  <nisse@lysator.liu.se>

548 549 550
	* sha3-permute.c (sha3_permute): Optimized, to reduce number of
	passes over the data. 20% speedup on x86_64, 4700 cycles.

Niels Möller's avatar
Niels Möller committed
551 552 553 554 555
	* configure.ac: Added sha3-permute.asm.

	* x86_64/sha3-permute.asm: New file. 30% speedup over current C
	code, 4300 cycles.

556 557 558 559
	* nettle.texinfo (Hash functions): Split into several sections,
	separating recommended hash functions and legacy hash functions.
	Document sha3-256.

560 561
2012-12-02  Niels Möller  <nisse@lysator.liu.se>

562 563
	Split sha.h into new files sha1.h and sha2.h. Replaced all
	internal usage of sha.h in all files.
564 565 566 567 568
	* sha.h: Kept for compatibility, just includes both new files.
	* sha1.h: New file.
	* sha2.h: New file.
	* Makefile.in (HEADERS): Added sha1.h and sha2.h.

569 570 571 572 573 574
2012-11-28  Niels Möller  <nisse@lysator.liu.se>

	From Fredrik Thulin:
	* testsuite/pbkdf2-test.c (test_main): Add PBKDF2-HMAC-SHA512 test
	cases.

Niels Möller's avatar
Niels Möller committed
575 576
2012-11-15  Niels Möller  <nisse@lysator.liu.se>

577 578 579
	* sha3-permute.c (sha3_permute): Use ULL suffix on round
	constants. Avoid passing shift count 0 to ROTL64.

580 581
	* sha3.c (sha3_absorb): Fixed big-endian code. Need macros.h.

Niels Möller's avatar
Niels Möller committed
582 583
	* macros.h (LE_READ_UINT64): New macro.

Niels Möller's avatar
Niels Möller committed
584 585
2012-11-13  Niels Möller  <nisse@lysator.liu.se>

586 587 588 589
	* sha3-permute.c (sha3_permute): Micro optimizations. Partial
	unrolling. Use lookup table for the permutation. On an x86_64,
	execution time reduced from appr. 13000 cycles to appr. 6000.

Niels Möller's avatar
Niels Möller committed
590 591 592 593 594
	* examples/nettle-benchmark.c (TIME_CYCLES): New macro.
	(bench_sha1_compress, bench_salsa20_core): Use it.
	(bench_sha3_permute): New function.
	(main): Call bench_sha3_permute.

595 596
2012-11-12  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
597 598
	* examples/nettle-benchmark.c (main): Benchmark sha3_256.

Niels Möller's avatar
Niels Möller committed
599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615
	* sha3-permute.c: New file. Permutation function for sha3, aka
	Keccak.
	* sha3.h: New header file.
	* sha3.c: New file, absorption and padding for sha3.
	* sha3-256.c: New file.
	* sha3-256-meta.c: New file.
	* nettle-meta.h (nettle_sha3_256): Declare.
	* Makefile.in (nettle_SOURCES): Added sha3 files.
	(HEADERS): Added sha3.h.
	* testsuite/sha3.awk: New file. Script to extract test vectors.
	* testsuite/sha3-256-test.c: New file.
	* testsuite/sha3-permute-test.c: New file.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added
	sha3-permute-test.c and sha3-256-test.c.
	(DISTFILES): Added sha3.awk.
	* testsuite/.test-rules.make: Added sha3 targets.

616 617 618 619 620 621
	* macros.h (LE_WRITE_UINT64): New macro.
	* write-le64.c (_nettle_write_le64): New file and function.
	* nettle-write.h (_nettle_write_le64): Declare. Also deleted
	declaration of non-existent _nettle_write_be64.
	* Makefile.in (nettle_SOURCES): Added write-le64.c.

622 623 624
	* macros.h (ROTL64): New macro, moved from...
	* sha512-compress.c (ROTL64): ... old location, deleted.

625 626 627 628 629 630 631 632
	* serpent-internal.h [HAVE_NATIVE_64_BIT] (DROTL32): Renamed from...
	(ROTL64): ... old name.
	(DRSHIFT32): Renamed from ...
	(RSHIFT64): ... old name.
	* serpent-encrypt.c (LINEAR_TRANSFORMATION64): Updated for above
	renames.
	* serpent-decrypt.c (LINEAR_TRANSFORMATION64_INVERSE): Likewise.

633 634 635 636 637
2012-11-11  Niels Möller  <nisse@lysator.liu.se>

	From Nikos Mavrogiannopoulos:
	* nettle.texinfo (Hash functions): Added documentation for
	gosthash94.
638
	* examples/nettle-benchmark.c (main): Benchmark gosthash94.
639

Niels Möller's avatar
Niels Möller committed
640 641 642 643 644
2012-11-10  Niels Möller  <nisse@lysator.liu.se>

	* nettle.texinfo (nettle_hashes, nettle_ciphers): Use deftypevr,
	not deftypevrx. Spotted by Nikos Mavrogiannopoulos.

645 646 647 648 649 650 651 652 653 654 655 656 657 658 659
2012-11-08  Niels Möller  <nisse@lysator.liu.se>

	Gost hash function, ported from Aleksey Kravchenko's rhash library
	by Nikos Mavrogiannopoulos.
	* gosthash94.c: New file.
	* gosthash94.h: New file.
	* gosthash94-meta.c: New file.
	* nettle-meta.h (nettle_gosthash94): Declare.
	* Makefile.in (nettle_SOURCES): Added gosthash94.c and
	gosthash94-meta.c.
	(HEADERS): Added gosthash94.h.
	* testsuite/gosthash94-test.c: New file.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Added
	gosthash94-test.c.

660 661 662 663 664 665
2012-10-29  Niels Möller  <nisse@lysator.liu.se>

	From Martin Storsjö:
	* configure.ac (dummy-dep-files): Avoid non-posix \|-operator in
	sed regexp.

666 667 668 669 670 671
2012-10-29  Niels Möller  <nisse@lysator.liu.se>

	* x86_64/salsa20-core-internal.asm: New file.
	* configure.ac: Added salsa20-core-internal.asm.
	* examples/nettle-benchmark.c (bench_salsa20_core): New function.

672 673
2012-10-27  Niels Möller  <nisse@lysator.liu.se>

674 675 676 677 678 679
	* testsuite/Makefile.in (TS_SOURCES, CXX_SOURCES): Include sources
	unconditionally.
	(TS_CXX): Moved @IF_CXX@ conditional here.
	(DISTFILES): Use $(SOURCES), which now includes all C source
	files. testutils.c was lost in a the 2012-09-20 change.

680 681 682 683 684 685
	* x86_64/salsa20-crypt.asm: Include x86_64/salsa20.m4.
	Make all exits go via .Lend and W64_EXIT.

	* x86_64/salsa20.m4: New file, extracted from
	x86_64/salsa20-crypt.asm.

686 687 688 689 690
2012-10-26  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac (LIBNETTLE_LINK, LIBHOGWEED_LIBS): Add $(CFLAGS) on
	the link command line. Reported by Dennis Clarke.

691 692 693 694 695 696
2012-10-03  Niels Möller  <nisse@lysator.liu.se>

	From: Nikos Mavrogiannopoulos:
	* testsuite/testutils.c (test_hash): On failure, print the
	expected and returned hash values.

697 698 699 700 701 702 703 704 705
2012-09-23  Niels Möller  <nisse@lysator.liu.se>

	* Makefile.in (nettle_SOURCES): Added salsa20-core-internal.c.

	* salsa20-core-internal.c (_salsa20_core): New file and function,
	extracted from salsa20_crypt.
	* salsa20.h (_salsa20_core): Declare it.
	* salsa20-crypt.c (salsa20_crypt): Use _salsa20_core.

706 707
2012-09-21  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
708 709 710
	* pbkdf2.c (pbkdf2): assert that iterations > 0. Reorganized
	loops.

711 712 713
	* nettle.texinfo (Cipher functions): Stress that the salsa20 hash
	function is not suitable as a general hash function.

714 715 716 717 718 719 720 721 722
2012-09-20  Simon Josefsson  <simon@josefsson.org>

	* pbkdf2-hmac-sha1.c, pbkdf2-hmac-sha256.c: New files.
	* pbkdf2.h (pbkdf2_hmac_sha1, pbkdf2_hmac_sha256): New prototypes.
	* Makefile.in (nettle_SOURCES): Add pbkdf2-hmac-sha1.c and
	pbkdf2-hmac-sha256.c.
	* nettle.texinfo (Key derivation functions): Improve.
	* testsuite/pbkdf2-test.c (test_main): Test new functions.

723 724
2012-09-20  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
725 726 727 728 729 730 731
	* pbkdf2.c (pbkdf2): Reordered arguments, for consistency.
	* pbkdf2.h (PBKDF2): Analogous reordering.
	* testsuite/pbkdf2-test.c: Adapted to new argument order. Also use
	LDATA for the salt.
	* nettle.texinfo (Key derivation functions): Updated documented
	pbkdf2 prototype.

732 733 734
	* testsuite/Makefile.in (VALGRIND): New variable, to make valgrind
	checking easier.

735 736 737 738 739 740
	* configure.ac: New substitution IF_CXX, replacing CXX_TESTS.
	(dummy-dep-files): Handle .cxx files.

	* testsuite/Makefile.in: Use IF_CXX. Include dependency file for
	cxx-test.o.

Simon Josefsson's avatar
Simon Josefsson committed
741 742
2012-09-19  Niels Möller  <nisse@lysator.liu.se>

Tim Ruehsen's avatar
Tim Ruehsen committed
743 744 745 746
	From Tim Rühsen:
	* examples/rsa-encrypt.c (main): Added missing mpz_clear.
	* examples/rsa-keygen.c (main): Added missing deallocation.

747 748 749
	* testsuite/meta-hash-test.c (test_main): Validate
	NETTLE_MAX_HASH_DIGEST_SIZE.

Simon Josefsson's avatar
Simon Josefsson committed
750 751 752 753 754 755 756 757 758 759 760 761 762 763 764
	* pbkdf2.h (PBKDF2): New macro.
	* testsuite/pbkdf2-test.c: Use it.

2012-09-12  Simon Josefsson  <simon@josefsson.org>

	* NEWS: Mention addition of PBKDF2.
	* pbkdf2.c (pbkdf2): New file and function.
	* pbkdf2.h: Declare it.
	* Makefile.in (nettle_SOURCES): Add pbkdf2.c.
	(HEADERS): Add pbkdf2.h.
	* nettle.texinfo (Key derivation functions): New section.
	* testsuite/pbkdf2-test.c: New test case.
	* testsuite/Makefile.in (TS_NETTLE_SOURCES): Add pbkdf2-test.c.
	* testsuite/.test-rules.make (pbkdf2-test): New target.

765 766
2012-09-16  Niels Möller  <nisse@lysator.liu.se>

767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810
	* testsuite/: Overhaul of testsuite, affecting almost all files.
	+ Use struct tstring for allocated strings, and deallocate before
	exit.
	+ Changed most test functions to take struct tstring as arguments.
	+ Made all test_main return on success.

	* testsuite/testutils.h (struct tstring): New struct type.
	(H2, HL, MEMEQH, SUCCESS): Deleted macros.
	(SHEX, SDATA): New macros.
	(H): Redefined to track storage.

	* testsuite/testutils.c (tstring_alloc): New function.
	(tstring_clear): New function.
	(tstring_data): New function.
	(tstring_hex): New function.
	(tstring_print_hex): New function.
	(decode_hex_length): Made static.
	(decode_hex): Made static. No return value, abort on error.
	(main): Expect test_main to return, and call tstring_clear before
	exit.
	(test_dsa_key): Added missing mpz_clear.
	(test_mac): Deleted unused function.

	* testsuite/rsa2sexp-test.c (test_main): Added missing
	nettle_buffer_clear.

	* testsuite/yarrow-test.c (open_file): Don't leak filename.
	(test_main): fclose input file properly.

	* testsuite/sexp-format-test.c (test_main): Added missing calls to
	nettle_buffer_clear and mpz_clear.

	* testsuite/serpent-test.c (tstring_hex_reverse): New function,
	replacing...
	(decode_hex_reverse): ... deleted function.
	(RHEX): New macro, replacing...
	(RH, RHL): ... deleted macros.

	* testsuite/rsa2sexp-test.c (test_main): Added missing
	nettle_buffer_clear.

	* testsuite/random-prime-test.c (test_main): Added missing
	mpz_clear.

811 812 813 814
	* realloc.c (nettle_realloc): Only call libc realloc if length >
	0, otherwise call free. Fixes a small memory leak.
	(nettle_xrealloc): Likewise.

815 816 817
	* run-tests (test_program): Don't quote $EMULATOR; allow it to
	expand to program and arguments (e.g., valgrind).

818 819 820 821
	* tools/pkcs1-conv.c (convert_public_key): Added missing calls to
	dsa_public_key_clear and rsa_public_key_clear.
	(main): Added missing nettle_buffer_clear.

Tim Ruehsen's avatar
Tim Ruehsen committed
822 823
2012-09-10  Niels Möller  <nisse@lysator.liu.se>

824 825 826
	* examples/eratosthenes.c (main): Explicitly deallocate storage
	before exit.

Niels Möller's avatar
Niels Möller committed
827 828 829
	* examples/io.c (read_file): Explicitly treat an empty file as an
	error. Rearrange loop, check for short fread return value.

Niels Möller's avatar
Niels Möller committed
830 831 832
	* desdata.c: Don't declare printf, include <stdio.h> instead. Also
	deleted casts of printf return value.

Tim Ruehsen's avatar
Tim Ruehsen committed
833
	From Tim Rühsen:
834
	* examples/nettle-benchmark.c (die): Use PRINTF_STYLE attribute.
Tim Ruehsen's avatar
Tim Ruehsen committed
835 836 837
	* pgp-encode.c (pgp_put_rsa_sha1_signature): Deleted unused variable.
	* rsa2openpgp.c (rsa_keypair_to_openpgp): Likewise.
	* examples/base16enc.c (main): Deleted useless allocations.
Tim Ruehsen's avatar
Tim Ruehsen committed
838

839 840 841 842 843 844 845 846 847
2012-09-07  Niels Möller  <nisse@lysator.liu.se>

	* examples/nettle-benchmark.c (die): Add NORETURN attribute. Patch
	from Tim Rühsen.
	* tools/misc.h (die, werror): Use PRINTF_STYLE and NORETURN macros
	for attributes. Patch from Tim Rühsen.

	* examples/io.h (werror): Use PRINTF_STYLE macro.

Sam Thursfield's avatar
Sam Thursfield committed
848 849 850 851 852 853 854 855
2012-08-22  Niels Möller  <nisse@lysator.liu.se>

	From Sam Thursfield <sam.thursfield@codethink.co.uk>:
	* configure.ac: Make documentation optional, to avoid requiring
	TeX. New option --disable-documentation, and Makefile substitution
	IF_DOCUMENTATION.
	* Makefile.in: Use IF_DOCUMENTATION.

856 857 858 859 860
2012-07-12  Niels Möller  <nisse@lysator.liu.se>

	* asm.m4 (ALIGN): Use << operator rather than **, with m4 eval.
	The latter is not supported by BSD m4.

Niels Möller's avatar
Niels Möller committed
861 862
2012-07-07  Niels Möller  <nisse@lysator.liu.se>

863 864
	Copyright headers: Updated FSF address. Patch from David Woodhouse.

865 866 867
	* examples/Makefile.in (BENCH_LIBS): Added -lm, needed for the
	ldexp function. Reported by Anthony G. Basile.

Niels Möller's avatar
Niels Möller committed
868 869
	* configure.ac: Changed version number to 2.6.

Niels Möller's avatar
Niels Möller committed
870 871
	* Released nettle-2.5.

872 873 874 875 876 877
2012-07-05  Niels Möller  <nisse@lysator.liu.se>

	* x86_64/salsa20-crypt.asm (salsa20_crypt): Write the 64-bit movq
	instructions as "movd", since that makes the osx assembler
	happier. Assembles to the same machine code on gnu/linux.

Niels Möller's avatar
Niels Möller committed
878 879
2012-07-03  Niels Möller  <nisse@lysator.liu.se>

880 881 882 883
	* aclocal.m4 (LSH_FUNC_ALLOCA): In the config.h boilerplate,
	include malloc.h if it exists, also when compiling with gcc.
	Needed for cross-compiling with --host=i586-mingw32msvc.

884
	* examples/base16dec.c: Don't #include files using <nettle/...>,
885 886
	we don't want to pick up installed versions. On windows, include
	<fcntl.h>, needed for _setmode.
887 888 889 890
	* examples/base16enc.c: Likewise.
	* examples/base64dec.c: Likewise.
	* examples/base64enc.c: Likewise

Niels Möller's avatar
Niels Möller committed
891 892
	* nettle.texinfo (Cipher functions): Document Salsa20.

893 894
2012-06-25  Niels Möller  <nisse@lysator.liu.se>

895 896 897
	* pkcs1.c (_pkcs1_signature_prefix): Renamed function, adding a
	leading underscore. Updated all callers.

898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923
	* bignum-next-prime.c (nettle_next_prime): Consistently use the
	type nettle_random_func * (rather then just nettle_random_func)
	when passing the function pointer as argument. Similar change for
	nettle_progress_func. Should have been done for the 2.0 release,
	but a few arguments were overlooked.
	* bignum-random-prime.c (_nettle_generate_pocklington_prime)
	(nettle_random_prime): Likewise.
	* bignum-random.c (nettle_mpz_random_size, nettle_mpz_random):
	Likewise.
	* dsa-keygen.c (dsa_generate_keypair): Likewise.
	* dsa-sha1-sign.c (dsa_sha1_sign_digest, dsa_sha1_sign): Likewise.
	* dsa-sha256-sign.c (dsa_sha256_sign_digest, dsa_sha256_sign):
	Likewise.
	* dsa-sign.c (_dsa_sign): Likewise.
	* pkcs1-encrypt.c (pkcs1_encrypt): Likewise.
	* rsa-blind.c (_rsa_blind): Likewise.
	* rsa-decrypt-tr.c (rsa_decrypt_tr): Likewise.
	* rsa-encrypt.c (rsa_encrypt): Likewise.
	* rsa-keygen.c (rsa_generate_keypair): Likewise.
	* rsa-pkcs1-sign-tr.c (rsa_pkcs1_sign_tr): Likewise.

	* cbc.c (cbc_encrypt, cbc_decrypt): Similarly, use the type
	nettle_crypt_func * rather than just nettle_crypt_func.
	* ctr.c (ctr_crypt): Likewise.
	* gcm.c (gcm_set_key): Likewise.

924 925 926 927
	* testsuite/des-compat-test.c (test_main): Disable declarations of
	disabled functions and variables, to avoid warnings. No verbose
	output unless verbose flag is set.

928 929
2012-06-09  Niels Möller  <nisse@lysator.liu.se>

930 931 932
	* examples/Makefile.in (SOURCES): Added base16dec.c, forgotten
	earlier.

933 934 935 936 937 938 939 940 941 942 943 944 945 946 947
	General pkcs1 signatures, with a "DigestInfo" input. Suggested by
	Nikos Mavrogiannopoulos.
	* Makefile.in (hogweed_SOURCES): Added pkcs1-rsa-digest.c,
	rsa-pkcs1-sign.c, rsa-pkcs1-sign-tr.c, and rsa-pkcs1-verify.c.

	* pkcs1-rsa-digest.c (pkcs1_rsa_digest_encode): New file and
	function.
	* pkcs1.h: Declare it.

	* rsa-pkcs1-verify.c (rsa_pkcs1_verify): New file and function.
	* rsa-pkcs1-sign.c (rsa_pkcs1_sign): New file and function.
	* rsa-pkcs1-sign-tr.c (rsa_pkcs1_sign_tr): New file and function,
	contributed by Nikos Mavrogiannopoulos.
	* rsa.h: Declare new functions.

948 949 950 951 952
	* rsa.h (_rsa_blind, _rsa_unblind): Declare functions.
	* rsa-blind.c (_rsa_blind, _rsa_unblind): Functions moved to a
	separate file, renamed and made non-static. Moved from...
	* rsa-decrypt-tr.c: ... here.

953 954 955 956 957 958 959 960 961 962 963
2012-06-03  Niels Möller  <nisse@lysator.liu.se>

	* testsuite/pkcs1-test.c (test_main): Include leading zero in
	expected result.

	* pkcs1.c (pkcs1_signature_prefix): Return pointer to where the
	digest should be written. Let the size input be the key size in
	octets, rather then key size - 1.
	* pkcs1-rsa-*.c: Updated for above.
	* rsa-*-sign.c, rsa-*-verify.c: Pass key->size, not key->size - 1.

964 965 966 967 968
2012-05-18  Niels Möller  <nisse@lysator.liu.se>

	* pkcs1-encrypt.c (pkcs1_encrypt): New file and function.
	* rsa-encrypt.c (rsa_encrypt): Use pkcs1_encrypt.

969 970 971 972 973
2012-05-09  Niels Möller  <nisse@lysator.liu.se>

	* rsa-decrypt-tr.c (rsa_decrypt_tr): Added missing mpz_clear,
	spotted by Nikos Mavrogiannopoulos.

974 975 976 977
2012-05-07  Niels Möller  <nisse@lysator.liu.se>

	* nettle-types.h (_STDINT_HAVE_INT_FAST32_T): Define here, to
	force nettle-stdint.h to not try to define the int_fast*_t types.
Niels Möller's avatar
Niels Möller committed
978
	Avoids compilation problems with gnutls on SunOS-5.8, where the
979 980
	definitions here collide with gnulib's.

981 982 983 984 985 986
2012-04-23  Niels Möller  <nisse@lysator.liu.se>

	* nettle-internal.h (NETTLE_MAX_BIGNUM_SIZE): New constant. Based
	on NETTLE_MAX_BIGNUM_BITS, rounded upwards. Replaced all uses of
	NETTLE_MAX_BIGNUM_BITS.

987 988 989 990 991
2012-04-19  Niels Möller  <nisse@lysator.liu.se>

	* list-obj-sizes.awk: Use decimal rather than hexadecimal output.
	(hex2int): Use local variables.

992 993 994 995
2012-04-18  Niels Möller  <nisse@lysator.liu.se>

	* x86_64/salsa20-crypt.asm: New file.

996 997
2012-04-17  Niels Möller  <nisse@lysator.liu.se>

998 999 1000 1001
	* testsuite/salsa20-test.c (test_salsa20_stream): Check that
	salsa20_crypt doesn't write beyond the given destination area.
	(test_salsa20): Likewise.

1002 1003 1004
	* salsa20-crypt.c: Renamed file, from...
	* salsa20.c: ... old name.

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

1007 1008 1009 1010 1011
	* 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
1012 1013 1014 1015 1016
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.

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

1019 1020
	* examples/io.c (write_file): Use write_string.

1021 1022 1023
	* examples/Makefile.in (base64enc): New targets. Also
	added missing io.o dependency to several other targets.
	(base64dec, base16enc, base16dec): Likewise.
1024 1025 1026

	* examples/base64enc.c: New file, based on example code
	contributed by Jeronimo Pellegrini.
1027 1028 1029
	* examples/base64dec.c: Likewise.
	* examples/base16enc.c: Likewise.
	* examples/base16dec.c: Likewise.
1030

1031 1032 1033 1034 1035 1036 1037
	* 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.

1038 1039 1040 1041 1042 1043 1044 1045 1046
	* 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.

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

1049 1050 1051 1052
	* aes-set-encrypt-key.c (aes_set_encrypt_key): Use LE_READ_UINT32.
	Tabulate the needed "round constants".
	(xtime): Deleted function.

1053 1054 1055
	* aes-internal.h (SUBBYTE): Cast to uint32_t. Use B0, ..., B3
	macros.

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

1058 1059 1060 1061 1062 1063
	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
1064
	nettle-meta.h, more consistent declarations of function pointer
1065
	arguments.
1066
	* testsuite/rsa-encrypt-test.c (test_main): Test rsa_decrypt_tr.
1067 1068
	Check for writes past the end of the message area.

1069 1070 1071 1072 1073
	* 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
1074 1075 1076
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
1077 1078
	(QROUND): New macro.
	(salsa20_hash): Use it.
Niels Möller's avatar
Niels Möller committed
1079

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

1082 1083
	* salsa20.c: (salsa20_set_iv): Deleted size argument, only one
	size allowed.
Niels Möller's avatar
Niels Möller committed
1084 1085
	(U8TO32_LITTLE): Deleted macro. Use LE_READ_UINT32 instead, which
	avoids unaligned reads.
Niels Möller's avatar
Niels Möller committed
1086 1087
	(salsa20_set_key): Rearranged slightly, to avoid unnecessary
	byte-to-word conversions.
Niels Möller's avatar
Niels Möller committed
1088

1089 1090 1091 1092 1093 1094 1095 1096
	(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.

1097 1098 1099 1100 1101
	* 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
1102 1103 1104 1105
	* 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
1106 1107 1108 1109 1110
	* 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
1111
	Unification of rotation macros.
Niels Möller's avatar
Niels Möller committed
1112 1113
	* macros.h (ROTL32): New macro, to replace (almost) all other
	rotation macros.
1114

Niels Möller's avatar
Niels Möller committed
1115 1116 1117
	* aes-set-encrypt-key.c: Include macros.h.
	(aes_set_encrypt_key): Use ROTL32.
	* aes-internal.h (ROTBYTE, ROTRBYTE): Deleted macros.
1118

1119 1120 1121 1122 1123
	* 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.
1124 1125 1126
	* cast128.c (ROL): Deleted macro.
	(F1, F2, F3): Updated to use ROTL32 (reversed order of arguments).
	Also added proper do { ... } while (0) wrappers.
1127

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

1131 1132 1133 1134 1135 1136 1137 1138 1139
	* 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
1140 1141
	* sha1-compress.c (ROTL): Deleted macro, use ROTL32 instead.

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

1146 1147 1148 1149 1150
	* 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.

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

1153 1154 1155 1156 1157 1158 1159 1160
	* 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.

1161
	* Makefile.in (soname link): Fixed logic.
1162
	(nettle_SOURCES): Removed nettle-internal.c, so that it's not
Niels Möller's avatar
Niels Möller committed
1163
	part of the library...
1164 1165 1166 1167
	(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.
1168

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

1171 1172 1173 1174 1175 1176 1177 1178
	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.

1179 1180
	* Makefile.in (soname links): Adding missing space before ].

1181 1182 1183 1184
2012-03-23  Niels Möller  <nisse@lysator.liu.se>

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

1185 1186 1187 1188
2012-03-05  Niels Möller  <nisse@lysator.liu.se>

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

1189 1190 1191 1192 1193
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.

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

1196 1197
	* list-obj-sizes.awk: Recognize elf64 objects.

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

1200 1201 1202 1203 1204 1205 1206 1207 1208 1209
	* 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.

1210 1211 1212 1213
	* 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
1214 1215
2012-02-18  Niels Möller  <nisse@lysator.liu.se>

1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227
	* 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
1228 1229
	* 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
1230

Niels Möller's avatar
Niels Möller committed
1231 1232 1233
	* nettle.texinfo: Updated charset declaration.
	* misc/plan.html: Likewise.

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

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

Niels Möller's avatar
Niels Möller committed
1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251
	* 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
1252 1253 1254
	* 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
1255 1256
	* testsuite/teardown-env: ...and delete them here. Also delete
	file testtmp.
Niels Möller's avatar
Niels Möller committed
1257 1258 1259
	* examples/setup-env: Similar links setup here.
	* examples/teardown-env: ... and deleted.

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

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

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

Niels Möller's avatar
Niels Möller committed
1267
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
1268 1269
	* x86_64/machine.m4 (W64_ENTRY, W64_EXIT): New macros for
	supporting W64 ABI.
1270
	* x86_64: Updated all assembly files to use them.
Niels Möller's avatar
Niels Möller committed
1271

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

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

Niels Möller's avatar
Niels Möller committed
1278
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290
	* 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
1291 1292 1293 1294
	* 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
1295
2011-11-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1296

1297 1298 1299
	* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
	on w64.

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

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

Niels Möller's avatar
Niels Möller committed
1306
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
1307 1308 1309 1310 1311
	* 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
1312 1313 1314 1315 1316 1317
	* 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
1318
	or wine64 when cross compiling for windows, otherwise empty.
Niels Möller's avatar
Niels Möller committed
1319 1320
	* config.make.in (EMULATOR): Set from autoconf value.

Niels Möller's avatar
Niels Möller committed
1321
2011-11-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1322 1323 1324

	* 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
1325
	w32 and other systems. w32 problem identified by Martin Storsjö.
Niels Möller's avatar
Niels Möller committed
1326 1327 1328 1329 1330 1331

	* 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
1332
2011-11-19  Niels Möller  <nisse@lysator.liu.se>
Martin Storsjö's avatar
Martin Storsjö committed
1333

Niels Möller's avatar
Niels Möller committed
1334
	Cygwin/mingw32 improvements contributed by Martin Storsjö:
1335 1336 1337 1338 1339
	* 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.
1340 1341 1342 1343 1344 1345 1346 1347
	(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
1348
	target for installing the DLL file in $bindir.
1349 1350 1351 1352 1353 1354
	(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
1355 1356
	* configure.ac: Unify shared lib setup for cygwin and mingw.

Niels Möller's avatar
Niels Möller committed
1357
2011-10-31  Niels Möller  <nisse@lysator.liu.se>
1358 1359

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

Niels Möller's avatar
Niels Möller committed
1362
2011-10-25  Niels Möller  <nisse@lysator.liu.se>
1363 1364 1365 1366

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

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

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

Niels Möller's avatar
Niels Möller committed
1372
2011-10-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1373 1374 1375 1376 1377 1378 1379 1380 1381

	* 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
1382
2011-09-03  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1383

Niels Möller's avatar
Niels Möller committed
1384 1385 1386 1387 1388 1389 1390 1391
	* 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.

1392 1393
	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.3.

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

Niels Möller's avatar
Niels Möller committed
1397 1398 1399
	* 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
1400
2011-09-02  Niels Möller  <nisse@amfibolit.hack.org>
Niels Möller's avatar
Niels Möller committed
1401 1402 1403 1404 1405

	* configure.ac: Changed version number to 2.4.

	* Released nettle-2.3.

Niels Möller's avatar
Niels Möller committed
1406
2011-08-30  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1407 1408 1409 1410 1411 1412 1413

	* 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
1414
2011-08-30  Niels Möller  <nisse@amfibolit.hack.org>
Niels Möller's avatar
Niels Möller committed
1415 1416 1417 1418 1419