gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-06-25 14:11:15 +02:00
commit 217dbde132
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/plugins/auth/AuthenticationCookie.class.php
View File

@ -720,8 +720,8 @@ class AuthenticationCookie extends AuthenticationPlugin
}
/**
* Encryption using blowfish algorithm (mcrypt)
* or phpseclib's AES if mcrypt not available
* Encryption using phpseclib's AES
* (it uses mcrypt when it is available)
*
* @param string $data original data
* @param string $secret the secret
@ -737,8 +737,8 @@ class AuthenticationCookie extends AuthenticationPlugin
}
/**
* Decryption using blowfish algorithm (mcrypt)
* or phpseclib's AES if mcrypt not available
* Decryption using phpseclib's AES
* (it uses mcrypt when it is available)
*
* @param string $encdata encrypted data
* @param string $secret the secret