diff options
| author | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
|---|---|---|
| committer | Eugene Kosov <claprix@yandex.ru> | 2019-07-09 13:22:22 +0300 |
| commit | 26c389b7b770a3699ec1fc81df7f379f6084c9e6 (patch) | |
| tree | 7f915e858b211834deeb52928dfdf5ab12b24bfe /extra | |
| parent | b9557418ccd9f484806515fba030757274e691f2 (diff) | |
| parent | fd08f953222b854428dc259631e8fc707fe34619 (diff) | |
| download | mariadb-git-26c389b7b770a3699ec1fc81df7f379f6084c9e6.tar.gz | |
Merge 10.1 into 10.2
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 */ |