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

3 4 5 6
	* 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.

7 8 9 10
	* 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.
11 12 13 14
	(_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.
15

16 17 18 19
	* configure.ac: Changed version number to 2.7.
	(LIBNETTLE_MINOR): Bumped library version, to 4.6
	(LIBHOGWEED_MINOR): And to 2.4

20 21
	* Makefile.in (distdir): Include files from armv7 subdirectory.

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

24 25 26
	* umac32.c (umac32_digest): Fix nonce caching.
	* umac64.c (umac64_digest): Likewise.

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

30 31 32 33 34
	* 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
35 36 37 38 39 40
	* 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.

41 42
	* macros.h (INCREMENT): Allow size == 1.

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

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

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

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

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

53 54
	* armv7/umac-nh.asm: New file. 2.4 time speedup.

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

57 58 59
	* configure.ac (asm_replace_list): Added umac-nh.asm and
	umac-nh-n.asm.

Niels Möller's avatar
Niels Möller committed
60 61 62
	* testsuite/umac-test.c: Test different alignments for the
	message.

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

Niels Möller's avatar
Niels Möller committed
65 66 67
	* 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
68 69 70
	* examples/nettle-benchmark.c (time_umac): New function.
	(main): Call it.

71 72 73 74 75 76 77 78 79
	* 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
80 81 82 83 84 85 86 87 88 89 90 91 92
	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.

93 94 95 96 97 98
	* 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.

99 100 101
	* x86_64/sha3-permute.asm: Go via memory for moves between general
	registers and xmm registers.

102 103 104 105 106 107
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.

108 109
2013-04-04  Niels Möller  <nisse@lysator.liu.se>

110 111 112
	* ecc-point.c (ecc_point_get): Allow NULL x or y, ignore
	corresponding coordinate.

113 114 115
	* nettle.texinfo (Elliptic curves): Document high-level ECDSA
	support.

116 117 118
	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.
119
	(mpn_sqr): Fallback macro.
120

121 122 123 124 125 126 127 128 129
	* 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
130 131
2013-04-03  Niels Möller  <nisse@lysator.liu.se>

132 133 134 135 136 137
	* 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
138 139 140
	* testsuite/salsa20-test.c (test_main): Tests for salsa20r12,
	contributed by Nikos Mavrogiannopoulos.

Niels Möller's avatar
Niels Möller committed
141 142 143 144
2013-03-26  Niels Möller  <nisse@lysator.liu.se>

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

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

147 148 149 150 151 152 153 154 155 156
	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
157 158 159 160 161
	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.

162
	From Martin Storsjö:
163 164
	* examples/hogweed-benchmark.c: Include local headers.
	* testsuite/ecdsa-keygen-test.c: Likewise.
165
	* x86_64/sha3-permute.asm: Workaround for Apple's assembler; write
166
	movq instructions as movd.
167

168 169 170
	* Makefile.in (hogweed_PURE_OBJS): Don't include OPT_ASM_SOURCES
	twice.

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

173 174
	* armv7/sha3-permute.asm: New file. 4.5 time speedup.

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

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

Niels Möller's avatar
Niels Möller committed
179 180 181 182
	* 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
183 184 185
	* armv7/sha512-compress.asm: Optimized. Keep expanded data in
	registers, exploit parallelism. Another 70% speedup.

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

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

191 192 193
	* armv7/sha512-compress.asm: New file, using neon instructions.
	2.3 time speedup.

Niels Möller's avatar
Niels Möller committed
194 195 196 197
	* 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.

198 199 200
	* sha512-compress.c (ROUND): Eliminated a temporary, analogous to
	sha256 change below.

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

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

Niels Möller's avatar
Niels Möller committed
206 207 208 209
	* armv7/sha256-compress.asm: New file, 25% speedup.

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

210 211
	* sha256-compress.c (ROUND): Eliminated a temporary.

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

214 215 216
	* testsuite/testutils.c (test_hash): Test different alignments for
	the hash input.

Niels Möller's avatar
Niels Möller committed
217 218 219 220 221 222
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.

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

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

Niels Möller's avatar
Niels Möller committed
227 228 229 230 231 232 233 234 235 236 237 238
	* 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.

239 240 241 242 243 244 245 246 247 248 249 250 251 252
	* 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.

253 254
	* x86_64/ecc-521-modp.asm: New file. 2.4 time speedup.

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

257
	* x86_64/ecc-384-modp.asm: New file, 3 time speedup.
258
	* x86_64/ecc-256-redc.asm: New file, 2.5 time speedup.
259 260 261
	* x86_64/ecc-224-modp.asm: New file, 5 time speedup over C
	version.

Niels Möller's avatar
Niels Möller committed
262 263 264 265 266 267 268
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
269 270 271 272 273 274 275 276
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.

277 278 279 280
2013-03-03  Niels Möller  <nisse@lysator.liu.se>

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

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

Niels Möller's avatar
Niels Möller committed
283 284 285 286
	* 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.

287 288
	* testsuite/ecc-redc-test.c: Increased test count.

Niels Möller's avatar
Niels Möller committed
289 290 291 292 293
	* 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.

294 295 296
	* configure.ac (asm_optional_list): Added ecc-224-modp.asm.
	(OPT_ASM_SOURCES): Fixed assignment.

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

299 300 301
	* x86_64/ecc-192-modp.asm: Reorganized to reduce number of
	additions. Use setc instruction.

302 303 304
	* examples/Makefile.in: Let $(HOGWEED_TARGETS) depend on
	../libhogweed.a.

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

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

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

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

317 318 319 320 321 322 323 324
	* 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.

325 326
	* testsuite/ecc-mod-test.c: Increased test count.

327 328 329
	* 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
330 331 332
	* examples/ecc-benchmark.c (bench_add_jjj): Typo fix, benchmark
	the right function.

333 334 335 336 337 338
	* 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.

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

Niels Möller's avatar
Niels Möller committed
341 342 343 344 345 346 347
	* 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.

348 349 350 351 352 353
	* 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.

354 355
	* nettle-internal.h (TMP_ALLOC): Added missing parentheses.

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

Niels Möller's avatar
Niels Möller committed
358 359 360 361 362 363
	* 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.
364

365 366 367 368 369 370 371 372 373 374 375 376 377 378 379
	* 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
380 381 382 383 384 385
	* 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.

386 387 388 389 390 391 392
	* 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.

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

Niels Möller's avatar
Niels Möller committed
395 396 397 398 399 400 401 402 403
	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.

404 405 406
	* testsuite/testutils.c: Removed redundant includes.
	(die): New function.

Niels Möller's avatar
Niels Möller committed
407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426
	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
427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456
	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.

457 458 459 460
	* gmp-glue.c: New file, mpn <-> mpz conversions.
	* gmp-glue.h: New file.
	* Makefile.in: Added to hogweed_SOURCES and DISTFILES, respectively.

461 462 463 464
	* 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
465 466
2013-02-19  Niels Möller  <nisse@lysator.liu.se>

467 468 469
	* 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
470
	(memxor3): Use 3-way unrolling also for aligned memxor3.
471
	Runs at 8 cycles (0.67 cycles per byte)
Niels Möller's avatar
Niels Möller committed
472

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

475 476 477
	* configure.ac: Find GMP's GMP_NUMB_BITS. Substitute in Makefile.
	* config.make.in (GMP_NUMB_BITS): New variable.

478 479 480 481
	* 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.

482 483 484 485 486
2013-02-12  Niels Möller  <nisse@lysator.liu.se>

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

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

489 490
	* armv7/memxor.asm (memxor, memxor3): Optimized aligned case, now
	runs at 0.75 cycles/byte.
491

492 493 494 495
	* armv7/README: New file.
	* armv7/machine.m4: New (empty) file.
	* armv7/memxor.asm: Initial assembly implementation.

496 497
	* config.m4.in: Substitute ASM_TYPE_PROGBITS as TYPE_PROGBITS.

498 499 500 501 502 503 504 505 506 507
	* 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.
508
	(ASM_ALIGN_LOG): Set to "no" when appropriate.
509 510 511 512
	(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.
513
	(asm_path): Set up asm_path for armv7.
514

515 516 517
	* asm.m4: Use changecom to disable m4 quoting. Use divert to
	suppress output.

518 519 520 521 522 523 524
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.

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

530 531 532 533
2013-01-16  Niels Möller  <nisse@lysator.liu.se>

	Released nettle-2.6.

534 535 536 537
2013-01-12  Niels Möller  <nisse@lysator.liu.se>

	* configure.ac: Use AC_LANG_SOURCE.

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

540 541 542
	* configure.ac (LIBNETTLE_MINOR): Bumped library version, to 4.5.
	(LIBHOGWEED_MINOR): And to 2.3.

543 544 545 546 547
	* examples/Makefile.in: Explicit rules for building objects in
	parent directory.
	* tools/Makefile.in: Likewise.
	* testsuite/Makefile.in: Likewise.

548 549
2013-01-01  Niels Möller  <nisse@lysator.liu.se>

550 551 552
	* nettle.texinfo (Recommended hash functions): Document additional
	sha3 functions.

553 554 555
	* examples/nettle-benchmark.c (main): Benchmark additional sha3
	functions.

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

558 559 560 561 562 563 564 565 566 567 568 569 570
	* 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.

571 572
	* configure.ac: Disabled use of sha3-permute.asm.

573 574 575 576 577 578 579 580
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.

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

583 584 585 586 587 588
	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.

589
	From Alon Bar-Lev:
590
	* configure.ac: Check for ar program. New option --disable-static.
591 592
	* config.make.in (AR): Use configured value.

593 594 595
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
596
	registers. 2400 cycles on x86_64, only slightly faster than the
597 598
	current C code.

599 600 601 602 603
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.

604 605 606 607 608 609 610 611 612 613 614
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.

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

617 618 619
	* 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
620 621 622 623 624
	* configure.ac: Added sha3-permute.asm.

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

625 626 627 628
	* nettle.texinfo (Hash functions): Split into several sections,
	separating recommended hash functions and legacy hash functions.
	Document sha3-256.

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

631 632
	Split sha.h into new files sha1.h and sha2.h. Replaced all
	internal usage of sha.h in all files.
633 634 635 636 637
	* 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.

638 639 640 641 642 643
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
644 645
2012-11-15  Niels Möller  <nisse@lysator.liu.se>

646 647 648
	* sha3-permute.c (sha3_permute): Use ULL suffix on round
	constants. Avoid passing shift count 0 to ROTL64.

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

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

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

655 656 657 658
	* 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
659 660 661 662 663
	* 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.

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

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

Niels Möller's avatar
Niels Möller committed
668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684
	* 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.

685 686 687 688 689 690
	* 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.

691 692 693
	* macros.h (ROTL64): New macro, moved from...
	* sha512-compress.c (ROTL64): ... old location, deleted.

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

702 703 704 705 706
2012-11-11  Niels Möller  <nisse@lysator.liu.se>

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

Niels Möller's avatar
Niels Möller committed
709 710 711 712 713
2012-11-10  Niels Möller  <nisse@lysator.liu.se>

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

714 715 716 717 718 719 720 721 722 723 724 725 726 727 728
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.

729 730 731 732 733 734
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.

735 736 737 738 739 740
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.

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

743 744 745 746 747 748
	* 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.

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

755 756 757 758 759
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.

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

766 767 768 769 770 771 772 773 774
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.

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

Niels Möller's avatar
Niels Möller committed
777 778 779
	* pbkdf2.c (pbkdf2): assert that iterations > 0. Reorganized
	loops.

780 781 782
	* nettle.texinfo (Cipher functions): Stress that the salsa20 hash
	function is not suitable as a general hash function.

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

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

Niels Möller's avatar
Niels Möller committed
794 795 796 797 798 799 800
	* 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.

801 802 803
	* testsuite/Makefile.in (VALGRIND): New variable, to make valgrind
	checking easier.

804 805 806 807 808 809
	* 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
810 811
2012-09-19  Niels Möller  <nisse@lysator.liu.se>

Tim Ruehsen's avatar
Tim Ruehsen committed
812 813 814 815
	From Tim Rühsen:
	* examples/rsa-encrypt.c (main): Added missing mpz_clear.
	* examples/rsa-keygen.c (main): Added missing deallocation.

816 817 818
	* testsuite/meta-hash-test.c (test_main): Validate
	NETTLE_MAX_HASH_DIGEST_SIZE.

Simon Josefsson's avatar
Simon Josefsson committed
819 820 821 822 823 824 825 826 827 828 829 830 831 832 833
	* 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.

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

836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879
	* 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.

880 881 882 883
	* realloc.c (nettle_realloc): Only call libc realloc if length >
	0, otherwise call free. Fixes a small memory leak.
	(nettle_xrealloc): Likewise.

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

887 888 889 890
	* 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
891 892
2012-09-10  Niels Möller  <nisse@lysator.liu.se>

893 894 895
	* examples/eratosthenes.c (main): Explicitly deallocate storage
	before exit.

Niels Möller's avatar
Niels Möller committed
896 897 898
	* 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
899 900 901
	* desdata.c: Don't declare printf, include <stdio.h> instead. Also
	deleted casts of printf return value.

Tim Ruehsen's avatar
Tim Ruehsen committed
902
	From Tim Rühsen:
903
	* examples/nettle-benchmark.c (die): Use PRINTF_STYLE attribute.
Tim Ruehsen's avatar
Tim Ruehsen committed
904 905 906
	* 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
907

908 909 910 911 912 913 914 915 916
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
917 918 919 920 921 922 923 924
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.

925 926 927 928 929
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
930 931
2012-07-07  Niels Möller  <nisse@lysator.liu.se>

932 933
	Copyright headers: Updated FSF address. Patch from David Woodhouse.

934 935 936
	* 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
937 938
	* configure.ac: Changed version number to 2.6.

Niels Möller's avatar
Niels Möller committed
939 940
	* Released nettle-2.5.

941 942 943 944 945 946
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
947 948
2012-07-03  Niels Möller  <nisse@lysator.liu.se>

949 950 951 952
	* 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.

953
	* examples/base16dec.c: Don't #include files using <nettle/...>,
954 955
	we don't want to pick up installed versions. On windows, include
	<fcntl.h>, needed for _setmode.
956 957 958 959
	* examples/base16enc.c: Likewise.
	* examples/base64dec.c: Likewise.
	* examples/base64enc.c: Likewise

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

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

964 965 966
	* pkcs1.c (_pkcs1_signature_prefix): Renamed function, adding a
	leading underscore. Updated all callers.

967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992
	* 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.

993 994 995 996
	* 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.

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

999 1000 1001
	* examples/Makefile.in (SOURCES): Added base16dec.c, forgotten
	earlier.

1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016
	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.

1017 1018 1019 1020 1021
	* 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.

1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032
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.

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

1038 1039 1040 1041 1042
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.

1043 1044 1045 1046
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
1047
	Avoids compilation problems with gnutls on SunOS-5.8, where the
1048 1049
	definitions here collide with gnulib's.

1050 1051 1052 1053 1054 1055
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.

1056 1057 1058 1059 1060
2012-04-19  Niels Möller  <nisse@lysator.liu.se>

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

1061 1062 1063 1064
2012-04-18  Niels Möller  <nisse@lysator.liu.se>

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

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

1067 1068 1069 1070
	* testsuite/salsa20-test.c (test_salsa20_stream): Check that
	salsa20_crypt doesn't write beyond the given destination area.
	(test_salsa20): Likewise.

1071 1072 1073
	* salsa20-crypt.c: Renamed file, from...
	* salsa20.c: ... old name.

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

1076 1077 1078 1079 1080
	* 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
1081 1082 1083 1084 1085
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.

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

1088 1089
	* examples/io.c (write_file): Use write_string.

1090 1091 1092
	* examples/Makefile.in (base64enc): New targets. Also
	added missing io.o dependency to several other targets.
	(base64dec, base16enc, base16dec): Likewise.
1093 1094 1095

	* examples/base64enc.c: New file, based on example code
	contributed by Jeronimo Pellegrini.
1096 1097 1098
	* examples/base64dec.c: Likewise.
	* examples/base16enc.c: Likewise.
	* examples/base16dec.c: Likewise.
1099

1100 1101 1102 1103 1104 1105 1106
	* 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.

1107 1108 1109 1110 1111 1112 1113 1114 1115
	* 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.

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

1118 1119 1120 1121
	* aes-set-encrypt-key.c (aes_set_encrypt_key): Use LE_READ_UINT32.
	Tabulate the needed "round constants".
	(xtime): Deleted function.

1122 1123 1124
	* aes-internal.h (SUBBYTE): Cast to uint32_t. Use B0, ..., B3
	macros.

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

1127 1128 1129 1130 1131 1132
	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
1133
	nettle-meta.h, more consistent declarations of function pointer
1134
	arguments.
1135
	* testsuite/rsa-encrypt-test.c (test_main): Test rsa_decrypt_tr.
1136 1137
	Check for writes past the end of the message area.

1138 1139 1140 1141 1142
	* 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
1143 1144 1145
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
1146 1147
	(QROUND): New macro.
	(salsa20_hash): Use it.
Niels Möller's avatar
Niels Möller committed
1148

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

1151 1152
	* salsa20.c: (salsa20_set_iv): Deleted size argument, only one
	size allowed.
Niels Möller's avatar
Niels Möller committed
1153 1154
	(U8TO32_LITTLE): Deleted macro. Use LE_READ_UINT32 instead, which
	avoids unaligned reads.
Niels Möller's avatar
Niels Möller committed
1155 1156
	(salsa20_set_key): Rearranged slightly, to avoid unnecessary
	byte-to-word conversions.
Niels Möller's avatar
Niels Möller committed
1157

1158 1159 1160 1161 1162 1163 1164 1165
	(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.

1166 1167 1168 1169 1170
	* 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
1171 1172 1173 1174
	* 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
1175 1176 1177 1178 1179
	* 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
1180
	Unification of rotation macros.
Niels Möller's avatar
Niels Möller committed
1181 1182
	* macros.h (ROTL32): New macro, to replace (almost) all other
	rotation macros.
1183

Niels Möller's avatar
Niels Möller committed
1184 1185 1186
	* aes-set-encrypt-key.c: Include macros.h.
	(aes_set_encrypt_key): Use ROTL32.
	* aes-internal.h (ROTBYTE, ROTRBYTE): Deleted macros.
1187

1188 1189 1190 1191 1192
	* 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.
1193 1194 1195
	* cast128.c (ROL): Deleted macro.
	(F1, F2, F3): Updated to use ROTL32 (reversed order of arguments).
	Also added proper do { ... } while (0) wrappers.
1196

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

1200 1201 1202 1203 1204 1205 1206 1207 1208
	* 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
1209 1210
	* sha1-compress.c (ROTL): Deleted macro, use ROTL32 instead.

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

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

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

1222 1223 1224 1225 1226 1227 1228 1229
	* 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.

1230
	* Makefile.in (soname link): Fixed logic.
1231
	(nettle_SOURCES): Removed nettle-internal.c, so that it's not
Niels Möller's avatar
Niels Möller committed
1232
	part of the library...
1233 1234 1235 1236
	(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.
1237

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

1240 1241 1242 1243 1244 1245 1246 1247
	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.

1248 1249
	* Makefile.in (soname links): Adding missing space before ].

1250 1251 1252 1253
2012-03-23  Niels Möller  <nisse@lysator.liu.se>

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

1254 1255 1256 1257
2012-03-05  Niels Möller  <nisse@lysator.liu.se>

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

1258 1259 1260 1261 1262
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.

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

1265 1266
	* list-obj-sizes.awk: Recognize elf64 objects.

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

1269 1270 1271 1272 1273 1274 1275 1276 1277 1278
	* 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.

1279 1280 1281 1282
	* 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
1283 1284
2012-02-18  Niels Möller  <nisse@lysator.liu.se>

1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296
	* 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
1297 1298
	* 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
1299

Niels Möller's avatar
Niels Möller committed
1300 1301 1302
	* nettle.texinfo: Updated charset declaration.
	* misc/plan.html: Likewise.

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

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

Niels Möller's avatar
Niels Möller committed
1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320
	* 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
1321 1322 1323
	* 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
1324 1325
	* testsuite/teardown-env: ...and delete them here. Also delete
	file testtmp.
Niels Möller's avatar
Niels Möller committed
1326 1327 1328
	* examples/setup-env: Similar links setup here.
	* examples/teardown-env: ... and deleted.

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

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

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

Niels Möller's avatar
Niels Möller committed
1336
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
1337 1338
	* x86_64/machine.m4 (W64_ENTRY, W64_EXIT): New macros for
	supporting W64 ABI.
1339
	* x86_64: Updated all assembly files to use them.
Niels Möller's avatar
Niels Möller committed
1340

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

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

Niels Möller's avatar
Niels Möller committed
1347
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359
	* 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
1360 1361 1362 1363
	* 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
1364
2011-11-24  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1365

1366 1367 1368
	* configure.ac (HAVE_NATIVE_64_BIT): Workaround to get it set to 1
	on w64.

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

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

Niels Möller's avatar
Niels Möller committed
1375
	From Martin Storsjö:
Niels Möller's avatar
Niels Möller committed
1376 1377 1378 1379 1380
	* 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
1381 1382 1383 1384 1385 1386
	* 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
1387
	or wine64 when cross compiling for windows, otherwise empty.
Niels Möller's avatar
Niels Möller committed
1388 1389
	* config.make.in (EMULATOR): Set from autoconf value.

Niels Möller's avatar
Niels Möller committed
1390
2011-11-20  Niels Möller  <nisse@lysator.liu.se>
Niels Möller's avatar
Niels Möller committed
1391 1392 1393

	* 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
1394
	w32 and other systems. w32 problem identified by Martin Storsjö.
Niels Möller's avatar
Niels Möller committed
1395 1396 1397 1398 1399 1400

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

Niels Möller's avatar
Niels Möller committed
1403
	Cygwin/mingw32 improvements contributed by Martin Storsjö:
1404 1405 1406 1407 1408
	* 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.
1409 1410 1411 1412 1413 1414 1415 1416
	(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
1417
	target for installing the DLL file in $bindir.
1418 1419 1420 1421 1422 </