ChangeLog 242 KB
Newer Older
1 2 3 4 5 6
2013-05-17  Niels Möller  <nisse@lysator.liu.se>

	* ecc-j-to-a.c (ecc_j_to_a): Fixed ecc_modp_mul call, to avoid
	invalid overlap of arguments to mpn_mul_n. Problem tracked down by
	Magnus Holmgren.

7 8
2013-05-16  Niels Möller  <nisse@lysator.liu.se>

9 10 11 12 13 14
	* arm/aes-encrypt-internal.asm: New file, for pre-v6 processors.
	* arm/aes-decrypt-internal.asm: New file, likewise.

	* arm/aes.m4 (AES_FINAL_ROUND_V5): Variant without using uxtb.
	(AES_FINAL_ROUND_V6): New name, updated callers.
	(AES_FINAL_ROUND): ... old name. Also eliminated one uxtb
Niels Möller's avatar
Niels Möller committed
15 16
	instruction.
	(AES_ENCRYPT_ROUND, AES_DECRYPT): Moved macros to the
17 18
	files using them.

19 20 21 22 23
	* arm/v6/aes-encrypt-internal.asm: Use ALIGN macro. Use 16-byte
	alignment for loops.
	* arm/v6/aes-decrypt-internal.asm: Likewise. Also added a nop
	which mysteriously improves benchmark performance on Cortex-A9.

24 25 26 27 28 29 30 31 32
2013-05-15  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac (asm_path): Handle armv6 and armv7 differently from
	older ARMs. Add the arm/v6 directory to asm_path when appropriate.

	* arm/v6/aes-encrypt-internal.asm: Moved into v6 directory. Uses
	the uxtb instruction which is not available for older ARMs.
	* arm/v6/aes-decrypt-internal.asm: Likewise.

33 34 35 36 37 38 39 40 41
2013-05-03  Niels Möller  <nisse@lysator.liu.se>

	* cast128.c: Adapt to new struct cast128_ctx.
	(cast128_set_key): Rewrite, eliminating lots of conditions and
	some false warnings.

	* cast128.h (struct cast128_ctx): Separate the small 5-bit
	rotation subkeys and the larger 32-bit masking subkeys.

42 43
2013-05-02  Niels Möller  <nisse@lysator.liu.se>

44 45 46 47
	* testsuite/testutils.c (mpz_combit): Renamed. Define only if not
	provided GMP. Updated all uses.
	(mpz_togglebit): ... old name.

48 49 50
	* sexp-format.c (sexp_vformat): Use type mpz_srcptr rather
	than the old MP_INT *.

51 52 53 54 55 56
2013-04-26  Niels Möller  <nisse@lysator.liu.se>

	* Many files: Use size_t rather than unsigned for data sizes.
	* x86_64/aes-encrypt-internal.asm: Accept 64-bit length.
	* x86_64/aes-decrypt-internal.asm: Likewise.

57 58
2013-04-25  Niels Möller  <nisse@lysator.liu.se>

59 60 61 62 63
	* configure.ac: Changed version number, to 2.8.
	(LIBNETTLE_MAJOR): Bumped major number, following
	nettle_memxor ABI break.
	(LIBNETTLE_MINOR): Reset to zero.

64 65
	* examples/hogweed-benchmark.c: Add benchmarking of OpenSSL's RSA
	functions.
66
	(all functions): Deleted unneeded casts.
67

Niels Möller's avatar
Niels Möller committed
68 69
2013-04-24  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
70 71 72
	* nettle.texinfo (Miscellaneous functions): Updated memxor
	prototype. Document memxor3.

73 74 75 76 77
	* salsa20-crypt.c (salsa20_crypt): Deleted cast of memxor
	argument, no longer needed.
	* salsa20r12-crypt.c (salsa20r12_crypt): Likewise.
	* sha3.c (sha3_absorb): Likewise.

78 79 80 81 82 83 84 85
	* memxor.h: Updated prototypes. Drop include of nettle-types.h.

	* memxor.c: Include nettle-types.h, for uintptr_t. Replace all
	internal uses of uint8_t by plain char.
	(memxor): Use void * rather than uint8_t * for
	arguments.
	(memxor3): Likewise.

86 87 88 89 90 91 92 93 94
	* x86_64/memxor.asm: Added nettle_ prefix to symbols.
	* arm/memxor.asm: Likewise.

	* testsuite/symbols-test: Don't allow memxor functions without
	nettle prefix,

	* memxor.h (memxor3): Added name mangling to add "nettle_" prefix
	to memxor and memxor3 symbols.

95 96 97 98 99 100 101
	* Makefile.in (nettle_OBJS): Deleted $(LIBOBJS), and also deleted
	LIBOBJS substitution.
	(nettle_SOURCES): Added memxor.c, to include it in the library
	unconditionally.

	* configure.ac: Deleted AC_REPLACE_FUNCS for memxor.

Niels Möller's avatar
Niels Möller committed
102 103
	* Released nettle-2.7.

104 105 106
2013-04-23  Niels Möller  <nisse@lysator.liu.se>

	From Martin Storsjö:
107 108
	* x86_64/sha256-compress.asm: Add forgotten W64_EXIT.
	* x86_64/sha512-compress.asm: Likewise.
109 110
	* x86_64/salsa20-crypt.asm (Lpartial): Don't return via W64_EXIT
	within this subfunction.
111 112
	* x86_64/machine.m4 (W64_ENTRY): Use movdqu instead of movdqa for
	saving xmm registers, since the stack is not guaranteed to be
113 114 115
	16-byte aligned on win64. Take pushed xmm registers into account
	when reading the fifth parameter from the stack.

116 117
	* Makefile.in: Consistently use EXEEXT_FOR_BUILD.

Niels Möller's avatar
Niels Möller committed
118 119 120 121 122
2013-04-21  Niels Möller  <nisse@lysator.liu.se>

	* Makefile.in (DISTFILES): Added mini-gmp.c and mini-gmp.h.
	(distdir): Use find, for identifying assembly files to copy.

123 124
2013-04-18  Niels Möller  <nisse@lysator.liu.se>

125 126
	* configure.ac: Recognize cpu type "arm*", not just "armv7*'.

127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144
	* arm/aes-encrypt-internal.asm: Updated include of aes.m4.
	* arm/aes-decrypt-internal.asm: Likewise.

	* Makefile.in (distdir): Updated for ARM reorganization.

	* configure.ac (asm_path): Generalized, can now be a list of
	directories. On ARM, check for neon instructions, and add arm/neon
	if appropriate. New command line options
	--enable-arm-neon/--disable-arm-neon, for overriding the default.

	arm/neon: New subdirectory, for assembly files making use of neon
	instructions.

	arm: Renamed directory, from...
	armv7: ...old name.

	* aclocal.m4 (NETTLE_CHECK_ARM_NEON): New macro.

Niels Möller's avatar
Niels Möller committed
145 146
	* nettle.texinfo (Keyed hash functions): Document UMAC.

147 148
	* umac.h (UMAC32_DIGEST_SIZE, UMAC64_DIGEST_SIZE)
	(UMAC96_DIGEST_SIZE, UMAC128_DIGEST_SIZE): New constants.
149 150 151
	(UMAC_DATA_SIZE): New name, for consistency with hash functions.
	Updated all uses.
	(UMAC_BLOCK_SIZE): ... old name.
152

153 154
2013-04-17  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
155 156 157 158 159 160
	* examples/nettle-benchmark.c (main): Benchmark salsa20r12.

	* nettle-internal.c (nettle_salsa20r12): Cipher struct for
	benchmarking only.
	* nettle-internal.h (nettle_salsa20): Declare it.

161 162
	* Makefile.in (eccdata): Depend on mini-gmp files. Drop -lgmp.

163 164 165 166 167 168 169
	* eccdata.c: Use mini-gmp, to avoid gmp dependency and associated
	configure tests for the *build* system. Replaced mpz_submul_ui by
	mpz_mul_ui + mpz_sub, and gmp_printf and gmp_fprintf by calls to
	mpz_out_str.

	* mini-gmp.h, mini-gmp.c: New files, copied from gmp-5.1.1.

170 171
2013-04-16  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
172 173 174
	* umac-set-key.c (BE_SWAP32_N): Fixed dummy definition used for
	big-endian systems.

175 176 177 178
	* Makefile.in (TARGETS): Deleted eccdata, it should be build only
	when public key support is enabled.
	(clean-here): Exlicitly list it here.

179 180 181 182
	* asm.m4 (m4_log2): New macro, similar to the one in gmp.
	(ALIGN): Changed to take alignment in bytes. Updated all callers,
	currently used only in x86 and x86_64 files.

183 184 185 186
	* umac.h (umac32_ctx, umac64_ctx, umac96_ctx, umac128_ctx): Make
	block count an uint64_t. Reorder some elements to put short values
	together.
	* umac-l2.c (_umac_l2, _umac_l2_final): Make count argument an uint64_t.
187 188 189 190
	(_umac_l2): Deleted redundant memcpy.
	(_umac_l2, _umac_l2_final): Store input buffer at end of the
	poly64/poly128 state. Deleted l1_out from corresponding context
	structs, and updated all callers.
191

192
	* configure.ac: Changed version number to 2.7.
Niels Möller's avatar
Niels Möller committed
193 194
	(LIBNETTLE_MINOR): Bumped library version, to 4.6.
	(LIBHOGWEED_MINOR): And to 2.4.
195

196 197
	* Makefile.in (distdir): Include files from armv7 subdirectory.

Niels Möller's avatar
Niels Möller committed
198 199
	* x86_64/umac-nh-n.asm: New file, 3.5 time speedup.

200 201 202
	* umac32.c (umac32_digest): Fix nonce caching.
	* umac64.c (umac64_digest): Likewise.

Niels Möller's avatar
Niels Möller committed
203 204 205
	* testsuite/umac-test.c (test_incr): New function.
	(test_main): Test nonce increment.

206 207 208 209 210
	* misc/umac/umac.py: UMAC reference implementation.
	* misc/umac/rijndael.py: AES implementation used by umac.py.
	* misc/umac/mkvectors: Script to generate UMAC test vectors.
	* misc/umac/vectors.out: Generated test vectors.

Niels Möller's avatar
Niels Möller committed
211 212 213 214 215 216
	* umac32.c (umac32_digest): Fix nonce increment, use INCREMENT
	macro.
	* umac64.c (umac64_digest): Likewise.
	* umac96.c (umac96_digest): Likewise.
	* umac128.c (umac128_digest): Likewise.

217 218
	* macros.h (INCREMENT): Allow size == 1.

Niels Möller's avatar
Niels Möller committed
219 220
2013-04-15  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
221 222
	* x86_64/umac-nh.asm: New file. 4.4 time speedup.

Niels Möller's avatar
Niels Möller committed
223 224
	* armv7/umac-nh-n.asm: New file. 2.0-2.3 time speedup.

Niels Möller's avatar
Niels Möller committed
225 226
	* testsuite/umac-test.c (test_align): Fixed memory leak.

Niels Möller's avatar
Niels Möller committed
227 228
2013-04-12  Niels Möller  <nisse@lysator.liu.se>

229 230
	* armv7/umac-nh.asm: New file. 2.4 time speedup.

Niels Möller's avatar
Niels Möller committed
231 232
	* armv7/machine.m4 (D0REG, D1REG): New macros.

233 234 235
	* configure.ac (asm_replace_list): Added umac-nh.asm and
	umac-nh-n.asm.

Niels Möller's avatar
Niels Möller committed
236 237 238
	* testsuite/umac-test.c: Test different alignments for the
	message.

239 240
2013-04-11  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
241 242 243
	* umac-nh-n.c (_umac_nh_n): Rewrote as a single pass over the
	message data.

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

247 248 249 250 251 252 253 254 255
	* 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
256 257 258 259 260 261 262 263 264 265 266 267 268
	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.

269 270 271 272 273 274
	* 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.

275 276 277
	* x86_64/sha3-permute.asm: Go via memory for moves between general
	registers and xmm registers.

278 279 280 281 282 283
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.

284 285
2013-04-04  Niels Möller  <nisse@lysator.liu.se>

286 287 288
	* ecc-point.c (ecc_point_get): Allow NULL x or y, ignore
	corresponding coordinate.

289 290 291
	* nettle.texinfo (Elliptic curves): Document high-level ECDSA
	support.

292 293 294
	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.
295
	(mpn_sqr): Fallback macro.
296

297 298 299 300 301 302 303 304 305
	* 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
306 307
2013-04-03  Niels Möller  <nisse@lysator.liu.se>

308 309 310 311 312 313
	* 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
314 315 316
	* testsuite/salsa20-test.c (test_main): Tests for salsa20r12,
	contributed by Nikos Mavrogiannopoulos.

Niels Möller's avatar
Niels Möller committed
317 318 319 320
2013-03-26  Niels Möller  <nisse@lysator.liu.se>

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

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

323 324 325 326 327 328 329 330 331 332
	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
333 334 335 336 337
	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.

338
	From Martin Storsjö:
339 340
	* examples/hogweed-benchmark.c: Include local headers.
	* testsuite/ecdsa-keygen-test.c: Likewise.
341
	* x86_64/sha3-permute.asm: Workaround for Apple's assembler; write
342
	movq instructions as movd.
343

344 345 346
	* Makefile.in (hogweed_PURE_OBJS): Don't include OPT_ASM_SOURCES
	twice.

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

349 350
	* armv7/sha3-permute.asm: New file. 4.5 time speedup.

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

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

Niels Möller's avatar
Niels Möller committed
355 356 357 358
	* 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
359 360 361
	* armv7/sha512-compress.asm: Optimized. Keep expanded data in
	registers, exploit parallelism. Another 70% speedup.

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

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

367 368 369
	* armv7/sha512-compress.asm: New file, using neon instructions.
	2.3 time speedup.

Niels Möller's avatar
Niels Möller committed
370 371 372 373
	* 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.

374 375 376
	* sha512-compress.c (ROUND): Eliminated a temporary, analogous to
	sha256 change below.

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

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

Niels Möller's avatar
Niels Möller committed
382 383 384 385
	* armv7/sha256-compress.asm: New file, 25% speedup.

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

386 387
	* sha256-compress.c (ROUND): Eliminated a temporary.

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

390 391 392
	* testsuite/testutils.c (test_hash): Test different alignments for
	the hash input.

Niels Möller's avatar
Niels Möller committed
393 394 395 396 397 398
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.

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

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

Niels Möller's avatar
Niels Möller committed
403 404 405 406 407 408 409 410 411 412 413 414
	* 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.

415 416 417 418 419 420 421 422 423 424 425 426 427 428
	* 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.

429 430
	* x86_64/ecc-521-modp.asm: New file. 2.4 time speedup.

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

433
	* x86_64/ecc-384-modp.asm: New file, 3 time speedup.
434
	* x86_64/ecc-256-redc.asm: New file, 2.5 time speedup.
435 436 437
	* x86_64/ecc-224-modp.asm: New file, 5 time speedup over C
	version.

Niels Möller's avatar
Niels Möller committed
438 439 440 441 442 443 444
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
445 446 447 448 449 450 451 452
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.

453 454 455 456
2013-03-03  Niels Möller  <nisse@lysator.liu.se>

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

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

Niels Möller's avatar
Niels Möller committed
459 460 461 462
	* 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.

463 464
	* testsuite/ecc-redc-test.c: Increased test count.

Niels Möller's avatar
Niels Möller committed
465 466 467 468 469
	* 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.

470 471 472
	* configure.ac (asm_optional_list): Added ecc-224-modp.asm.
	(OPT_ASM_SOURCES): Fixed assignment.

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

475 476 477
	* x86_64/ecc-192-modp.asm: Reorganized to reduce number of
	additions. Use setc instruction.

478 479 480
	* examples/Makefile.in: Let $(HOGWEED_TARGETS) depend on
	../libhogweed.a.

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

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

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

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

493 494 495 496 497 498 499 500
	* 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.

501 502
	* testsuite/ecc-mod-test.c: Increased test count.

503 504 505
	* 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
506 507 508
	* examples/ecc-benchmark.c (bench_add_jjj): Typo fix, benchmark
	the right function.

509 510 511 512 513 514
	* 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.

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

Niels Möller's avatar
Niels Möller committed
517 518 519 520 521 522 523
	* 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.

524 525 526 527 528 529
	* 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.

530 531
	* nettle-internal.h (TMP_ALLOC): Added missing parentheses.

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

Niels Möller's avatar
Niels Möller committed
534 535 536 537 538 539
	* 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.
540

541 542 543 544 545 546 547 548 549 550 551 552 553 554 555
	* 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
556 557 558 559 560 561
	* 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.

562 563 564 565 566 567 568
	* 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.

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

Niels Möller's avatar
Niels Möller committed
571 572 573 574 575 576 577 578 579
	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.

580 581 582
	* testsuite/testutils.c: Removed redundant includes.
	(die): New function.

Niels Möller's avatar
Niels Möller committed
583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602
	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
603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632
	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.

633 634 635 636
	* gmp-glue.c: New file, mpn <-> mpz conversions.
	* gmp-glue.h: New file.
	* Makefile.in: Added to hogweed_SOURCES and DISTFILES, respectively.

637 638 639 640
	* 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
641 642
2013-02-19  Niels Möller  <nisse@lysator.liu.se>

643 644 645
	* 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
646
	(memxor3): Use 3-way unrolling also for aligned memxor3.
647
	Runs at 8 cycles (0.67 cycles per byte)
Niels Möller's avatar
Niels Möller committed
648

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

651 652 653
	* configure.ac: Find GMP's GMP_NUMB_BITS. Substitute in Makefile.
	* config.make.in (GMP_NUMB_BITS): New variable.

654 655 656 657
	* 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.

658 659 660 661 662
2013-02-12  Niels Möller  <nisse@lysator.liu.se>

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

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

665 666
	* armv7/memxor.asm (memxor, memxor3): Optimized aligned case, now
	runs at 0.75 cycles/byte.
667

668 669 670 671
	* armv7/README: New file.
	* armv7/machine.m4: New (empty) file.
	* armv7/memxor.asm: Initial assembly implementation.

672 673
	* config.m4.in: Substitute ASM_TYPE_PROGBITS as TYPE_PROGBITS.

674 675 676 677 678 679 680 681 682 683
	* 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.
684
	(ASM_ALIGN_LOG): Set to "no" when appropriate.
685 686 687 688
	(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.
689
	(asm_path): Set up asm_path for armv7.
690

691 692 693
	* asm.m4: Use changecom to disable m4 quoting. Use divert to
	suppress output.

694 695 696 697 698 699 700
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.

701 702 703 704 705
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.

706 707
2013-01-16  Niels Möller  <nisse@lysator.liu.se>

Niels Möller's avatar
Niels Möller committed
708
	* Released nettle-2.6.
709

710 711 712 713
2013-01-12  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac: Use AC_LANG_SOURCE.

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

716 717 718
	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.5.
	(LIBHOGWEED_MINOR): And to 2.3.

719 720 721 722 723
	* examples/Makefile.in: Explicit rules for building objects in
	parent directory.
	* tools/Makefile.in: Likewise.
	* testsuite/Makefile.in: Likewise.

724 725
2013-01-01  Niels Möller  <nisse@lysator.liu.se>

726 727 728
	* nettle.texinfo (Recommended hash functions): Document additional
	sha3 functions.

729 730 731
	* examples/nettle-benchmark.c (main): Benchmark additional sha3
	functions.

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

734 735 736 737 738 739 740 741 742 743 744 745 746
	* 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.

747 748
	* configure.ac: Disabled use of sha3-permute.asm.

749 750 751 752 753 754 755 756
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.

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

759 760 761 762 763 764
	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.

765
	From Alon Bar-Lev:
766
	* configure.ac: Check for ar program. New option --disable-static.
767 768
	* config.make.in (AR): Use configured value.

769 770 771
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
772
	registers. 2400 cycles on x86_64, only slightly faster than the
773 774
	current C code.

775 776 777 778 779
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.

780 781 782 783 784 785 786 787 788 789 790
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.

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

793 794 795
	* 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
796 797 798 799 800
	* configure.ac: Added sha3-permute.asm.

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

801 802 803 804
	* nettle.texinfo (Hash functions): Split into several sections,
	separating recommended hash functions and legacy hash functions.
	Document sha3-256.

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

807 808
	Split sha.h into new files sha1.h and sha2.h. Replaced all
	internal usage of sha.h in all files.
809 810 811 812 813
	* 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.

814 815 816 817 818 819
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
820 821
2012-11-15  Niels Möller  <nisse@lysator.liu.se>

822 823 824
	* sha3-permute.c (sha3_permute): Use ULL suffix on round
	constants. Avoid passing shift count 0 to ROTL64.

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

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

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

831 832 833 834
	* 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
835 836 837 838 839
	* 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.

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

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

Niels Möller's avatar
Niels Möller committed
844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860
	* 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.

861 862 863 864 865 866
	* 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.

867 868 869
	* macros.h (ROTL64): New macro, moved from...
	* sha512-compress.c (ROTL64): ... old location, deleted.

870 871 872 873 874 875 876 877
	* 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.

878 879 880 881 882
2012-11-11  Niels Möller  <nisse@lysator.liu.se>

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

Niels Möller's avatar
Niels Möller committed
885 886 887 888 889
2012-11-10  Niels Möller  <nisse@lysator.liu.se>

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

890 891 892 893 894 895 896 897 898 899 900 901 902 903 904
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.

905 906 907 908 909 910
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.

911 912 913 914 915 916
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.

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

919 920 921 922 923 924
	* 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.

925 926 927 928 929 930
	* 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.

931 932 933 934 935
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.

936 937 938 939 940 941
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.

942 943 944 945 946 947 948 949 950
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.

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

Niels Möller's avatar
Niels Möller committed
953 954 955
	* pbkdf2.c (pbkdf2): assert that iterations > 0. Reorganized
	loops.

956 957 958
	* nettle.texinfo (Cipher functions): Stress that the salsa20 hash
	function is not suitable as a general hash function.

959 960 961 962 963 964 965 966 967
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.

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

Niels Möller's avatar
Niels Möller committed
970 971 972 973 974 975 976
	* 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.

977 978 979
	* testsuite/Makefile.in (VALGRIND): New variable, to make valgrind
	checking easier.

980 981 982 983 984 985
	* 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
986 987
2012-09-19  Niels Möller  <nisse@lysator.liu.se>

Tim Ruehsen's avatar
Tim Ruehsen committed
988 989 990 991
	From Tim Rühsen:
	* examples/rsa-encrypt.c (main): Added missing mpz_clear.
	* examples/rsa-keygen.c (main): Added missing deallocation.

992 993 994
	* testsuite/meta-hash-test.c (test_main): Validate
	NETTLE_MAX_HASH_DIGEST_SIZE.

Simon Josefsson's avatar
Simon Josefsson committed
995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009
	* 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.

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

1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055
	* 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.

1056 1057 1058 1059
	* realloc.c (nettle_realloc): Only call libc realloc if length >
	0, otherwise call free. Fixes a small memory leak.
	(nettle_xrealloc): Likewise.

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

1063 1064 1065 1066
	* 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
1067 1068
2012-09-10  Niels Möller  <nisse@lysator.liu.se>

1069 1070 1071
	* examples/eratosthenes.c (main): Explicitly deallocate storage
	before exit.

Niels Möller's avatar
Niels Möller committed
1072 1073 1074
	* 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
1075 1076 1077
	* desdata.c: Don't declare printf, include <stdio.h> instead. Also
	deleted casts of printf return value.

Tim Ruehsen's avatar
Tim Ruehsen committed
1078
	From Tim Rühsen:
1079
	* examples/nettle-benchmark.c (die): Use PRINTF_STYLE attribute.
Tim Ruehsen's avatar
Tim Ruehsen committed
1080 1081 1082
	* 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
1083

1084 1085 1086 1087 1088 1089 1090 1091 1092
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
1093 1094 1095 1096 1097 1098 1099 1100
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.

1101 1102 1103 1104 1105
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
1106 1107
2012-07-07  Niels Möller  <nisse@lysator.liu.se>

1108 1109
	Copyright headers: Updated FSF address. Patch from David Woodhouse.

1110 1111 1112
	* 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
1113 1114
	* configure.ac: Changed version number to 2.6.

Niels Möller's avatar
Niels Möller committed
1115 1116
	* Released nettle-2.5.

1117 1118 1119 1120 1121 1122
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
1123 1124
2012-07-03  Niels Möller  <nisse@lysator.liu.se>

1125 1126 1127 1128
	* 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.

1129
	* examples/base16dec.c: Don't #include files using <nettle/...>,
1130 1131
	we don't want to pick up installed versions. On windows, include
	<fcntl.h>, needed for _setmode.
1132 1133 1134 1135
	* examples/base16enc.c: Likewise.
	* examples/base64dec.c: Likewise.
	* examples/base64enc.c: Likewise

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

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

1140 1141 1142
	* pkcs1.c (_pkcs1_signature_prefix): Renamed function, adding a
	leading underscore. Updated all callers.

1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
	* 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.

1169 1170 1171 1172
	* 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.

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

1175 1176 1177
	* examples/Makefile.in (SOURCES): Added base16dec.c, forgotten
	earlier.

1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192
	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.

1193 1194 1195 1196 1197
	* 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.

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

1209 1210 1211 1212 1213
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.

1214 1215 1216 1217 1218
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.

1219 1220 1221 1222
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
1223
	Avoids compilation problems with gnutls on SunOS-5.8, where the
1224 1225
	definitions here collide with gnulib's.

1226 1227 1228 1229 1230 1231
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.

1232 1233 1234 1235 1236
2012-04-19  Niels Möller  <nisse@lysator.liu.se>

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

1237 1238 1239 1240
2012-04-18  Niels Möller  <nisse@lysator.liu.se>

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

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

1243 1244 1245 1246
	* testsuite/salsa20-test.c (test_salsa20_stream): Check that
	salsa20_crypt doesn't write beyond the given destination area.
	(test_salsa20): Likewise.

1247 1248 1249
	* salsa20-crypt.c: Renamed file, from...
	* salsa20.c: ... old name.

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

1252 1253 1254 1255 1256
	* 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
1257 1258 1259 1260 1261
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.

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

1264 1265
	* examples/io.c (write_file): Use write_string.

1266 1267 1268
	* examples/Makefile.in (base64enc): New targets. Also
	added missing io.o dependency to several other targets.
	(base64dec, base16enc, base16dec): Likewise.
1269 1270 1271

	* examples/base64enc.c: New file, based on example code
	contributed by Jeronimo Pellegrini.
1272 1273 1274
	* examples/base64dec.c: Likewise.
	* examples/base16enc.c: Likewise.
	* examples/base16dec.c: Likewise.
1275

1276 1277 1278 1279 1280 1281 1282
	* 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.

1283 1284 1285 1286 1287 1288 1289 1290 1291
	* 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.

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

1294 1295 1296 1297
	* aes-set-encrypt-key.c (aes_set_encrypt_key): Use LE_READ_UINT32.
	Tabulate the needed "round constants".
	(xtime): Deleted function.

1298 1299 1300
	* aes-internal.h (SUBBYTE): Cast to uint32_t. Use B0, ..., B3
	macros.

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

1303 1304 1305 1306 1307 1308
	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
1309
	nettle-meta.h, more consistent declarations of function pointer
1310
	arguments.
1311
	* testsuite/rsa-encrypt-test.c (test_main): Test rsa_decrypt_tr.
1312 1313
	Check for writes past the end of the message area.

1314 1315 1316 1317 1318
	* 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
1319 1320 1321
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
1322 1323
	(QROUND): New macro.
	(salsa20_hash): Use it.
Niels Möller's avatar
Niels Möller committed
1324

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

1327 1328
	* salsa20.c: (salsa20_set_iv): Deleted size argument, only one
	size allowed.
Niels Möller's avatar
Niels Möller committed
1329 1330
	(U8TO32_LITTLE): Deleted macro. Use LE_READ_UINT32 instead, which
	avoids unaligned reads.
Niels Möller's avatar
Niels Möller committed
1331 1332
	(salsa20_set_key): Rearranged slightly, to avoid unnecessary
	byte-to-word conversions.
Niels Möller's avatar
Niels Möller committed
1333

1334 1335 1336 1337 1338 1339 1340 1341
	(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.

1342 1343 1344 1345 1346
	* 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
1347 1348 1349 1350
	* 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
1351 1352 1353 1354 1355
	* 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
1356
	Unification of rotation macros.
Niels Möller's avatar
Niels Möller committed
1357 1358
	* macros.h (ROTL32): New macro, to replace (almost) all other
	rotation macros.
1359

Niels Möller's avatar
Niels Möller committed
1360 1361 1362
	* aes-set-encrypt-key.c: Include macros.h.
	(aes_set_encrypt_key): Use ROTL32.
	* aes-internal.h (ROTBYTE, ROTRBYTE): Deleted macros.
1363

1364 1365 1366 1367 1368
	* 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.
1369 1370 1371
	* cast128.c (ROL): Deleted macro.
	(F1, F2, F3): Updated to use ROTL32 (reversed order of arguments).
	Also added proper do { ... } while (0) wrappers.
1372

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

1376 1377 1378 1379 1380 1381 1382 1383 1384
	* 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
1385 1386
	* sha1-compress.c (ROTL): Deleted macro, use ROTL32 instead.

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

1391 1392 1393 1394 1395
	* 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.

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

1398 1399 1400 1401 1402 1403 1404 1405
	* 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.

1406
	* Makefile.in (soname link): Fixed logic.
1407
	(nettle_SOURCES): Removed nettle-internal.c, so that it's not
Niels Möller's avatar
Niels Möller committed
1408
	part of the library...
1409 1410 1411 1412
	(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.
1413

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

1416 1417 1418 1419 1420 1421 1422 1423
	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.

1424 1425
	* Makefile.in (soname links): Adding missing space before ].

1426 1427 1428 1429
2012-03-23  Niels Möller  <nisse@lysator.liu.se>

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

1430 1431 1432 1433
2012-03-05  Niels Möller  <nisse@lysator.liu.se>

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

1434 1435 1436 1437 1438
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.

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

1441 1442
	* list-obj-sizes.awk: Recognize elf64 objects.

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

1445 1446 1447 1448 1449 1450 1451 1452 1453 1454
	* Makefile.in (TARGETS): Added twofishdata.
	(SOURCES): Added twofishdata.c.
	(twofishdata): New rule.

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