Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: b866371b9a79625c11a91dec4feb4e206ad48dc0 https://github.com/phpmyadmin/phpmyadmin/commit/b866371b9a79625c11a91dec4feb... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.php

Log Message: ----------- Determine whether to use openssl just once

Issue #12293

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 03bc52f6dcbb8e549b2e0fef3d60e7103681558a https://github.com/phpmyadmin/phpmyadmin/commit/03bc52f6dcbb8e549b2e0fef3d60... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php

Log Message: ----------- Correctly report OpenSSL errors from cookie encryption

Without calling openssl_error_string() we pollute openssl global state and some other library might report this as failure (eg. mysqlnd driver when connecting to SSL enabled server).

Fixes #12293

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 30cd5fc358d08d95a9640d22311deaf8e4fc1032 https://github.com/phpmyadmin/phpmyadmin/commit/30cd5fc358d08d95a9640d22311d... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M libraries/plugins/auth/AuthenticationCookie.php M test/classes/plugin/auth/AuthenticationCookieTest.php

Log Message: ----------- Use same encryption key with openssl and phpseclib

Issue #12293

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 09da5eb49f4bef0d16c48c6bc30b3b17a3b8f799 https://github.com/phpmyadmin/phpmyadmin/commit/09da5eb49f4bef0d16c48c6bc30b... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M test/classes/plugin/auth/AuthenticationCookieTest.php

Log Message: ----------- Test both with and without phpseclib

This ensures we generate compatible data in both cases.

Issue #12293

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 92aa487c5422bcd992ee17abb36420d90daf444a https://github.com/phpmyadmin/phpmyadmin/commit/92aa487c5422bcd992ee17abb364... Author: Michal Čihař michal@cihar.com Date: 2016-12-20 (Tue, 20 Dec 2016)

Changed paths: M ChangeLog M libraries/plugins/auth/AuthenticationCookie.php M test/classes/plugin/auth/AuthenticationCookieTest.php

Log Message: ----------- Merge branch 'QA_4_6'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5cbcb202b812...92aa487c5422