diff options
| author | unknown <msvensson@shellback.(none)> | 2006-11-29 12:11:04 +0100 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-11-29 12:11:04 +0100 |
| commit | cd69f462a1d4c68e7fabed8bd6db7ed113ebee22 (patch) | |
| tree | 144ad0b59c530c00d36c4b7fc2b1d1cceeb2be7b /extra/yassl/taocrypt/include/arc4.hpp | |
| parent | 89d106c1a4efad141e7850373335482ad46aeec5 (diff) | |
| parent | eb6ab467cee34e31930ff8496f7eea4b636fabe6 (diff) | |
| download | mariadb-git-cd69f462a1d4c68e7fabed8bd6db7ed113ebee22.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/yassl_import/my50-yassl_import
into shellback.(none):/home/msvensson/mysql/yassl_import/mysql-5.0-maint
extra/yassl/src/ssl.cpp:
Auto merged
Diffstat (limited to 'extra/yassl/taocrypt/include/arc4.hpp')
| -rw-r--r-- | extra/yassl/taocrypt/include/arc4.hpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/include/arc4.hpp b/extra/yassl/taocrypt/include/arc4.hpp index 05b0921f5a1..ddd5082f557 100644 --- a/extra/yassl/taocrypt/include/arc4.hpp +++ b/extra/yassl/taocrypt/include/arc4.hpp @@ -46,7 +46,6 @@ public: ARC4() {} void Process(byte*, const byte*, word32); - void AsmProcess(byte*, const byte*, word32); void SetKey(const byte*, word32); private: byte x_; @@ -55,6 +54,8 @@ private: ARC4(const ARC4&); // hide copy const ARC4 operator=(const ARC4&); // and assign + + void AsmProcess(byte*, const byte*, word32); }; } // namespace |