Merge remote-tracking branch 'public/pr/2270' into development

This commit is contained in:
Simon Butcher 2018-12-20 12:04:13 +00:00
commit 032c037052
7 changed files with 146 additions and 35 deletions

View file

@ -75,7 +75,7 @@
* MD5 1 0x002F-0x002F
* RIPEMD160 1 0x0031-0x0031
* SHA1 1 0x0035-0x0035 0x0073-0x0073
* SHA256 1 0x0037-0x0037
* SHA256 1 0x0037-0x0037 0x0074-0x0074
* SHA512 1 0x0039-0x0039
* CHACHA20 3 0x0051-0x0055
* POLY1305 3 0x0057-0x005B