diff options
| author | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 15:42:36 +0300 |
|---|---|---|
| committer | Eugene Kosov <eugene.kosov@mariadb.com> | 2019-07-16 18:39:21 +0300 |
| commit | 0f83c8878dc1389212c134f65d37a43d9d248250 (patch) | |
| tree | 6950ea9b6c449a6e5d8a0205b3d06ae275a6234c /extra | |
| parent | aa96e56c55c44d2c20c1cd70325ef88ad0af8f98 (diff) | |
| parent | d2f094d9e63e97293915b17b30a73b2552647a38 (diff) | |
| download | mariadb-git-0f83c8878dc1389212c134f65d37a43d9d248250.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/src/des.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/des.cpp b/extra/yassl/taocrypt/src/des.cpp index 5b6fd9aa05b..f921cfcc977 100644 --- a/extra/yassl/taocrypt/src/des.cpp +++ b/extra/yassl/taocrypt/src/des.cpp @@ -224,7 +224,7 @@ void BasicDES::SetKey(const byte* key, word32 /*length*/, CipherDir dir) byte *const pc1m = buffer; /* place to modify pc1 into */ byte *const pcr = pc1m + 56; /* place to rotate pc1 into */ byte *const ks = pcr + 56; - register int i,j,l; + int i,j,l; int m; for (j = 0; j < 56; j++) { /* convert pc1 to bits of key */ |