chiark / gitweb /
~mdw / catacomb / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 57e7040 0a847b1)
Merge branch '2.3.x'
authorMark Wooding <mdw@distorted.org.uk>
Fri, 14 Apr 2017 22:27:50 +0000 (23:27 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 14 Apr 2017 22:27:50 +0000 (23:27 +0100)
* 2.3.x:
  symm/salsa20.[ch]: Add missing LGPL notices.
  math/mpx-mul4-test.c: Set `dstr' length correctly in conversion function.
  symm/chacha.c: Fix `tell' response.
  symm/chacha.[ch]: Fix comment headers.
  symm/{chacha.c,salsa20.c}: Fix random generator allocation sizes.


Trivial merge
Catacomb cryptographic library