Merge remote-tracking branch 'upstream-public/pr/964' into development

This commit is contained in:
Gilles Peskine 2018-01-02 16:24:29 +01:00
commit 17196cd3be
5 changed files with 230 additions and 206 deletions

View file

@ -52,7 +52,7 @@
* GCM 2 0x0012-0x0014
* BLOWFISH 2 0x0016-0x0018
* THREADING 3 0x001A-0x001E
* AES 2 0x0020-0x0022
* AES 2 0x0020-0x0022 0x0023-0x0023
* CAMELLIA 2 0x0024-0x0026
* XTEA 1 0x0028-0x0028
* BASE64 2 0x002A-0x002C