[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 491c42: Patch by Robert Scheck <robert at fedoraproject.org> ...

[Marc Delisle]

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 491c426623ff8a4f3f99078801412ed155cb168a
      https://github.com/phpmyadmin/phpmyadmin/commit/491c426623ff8a4f3f99078801412ed155cb168a
  Author: Robert Scheck <robert at fedoraproject.org>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

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

  Log Message:
  -----------
  Patch by Robert Scheck <robert at fedoraproject.org> for phpMyAdmin 4.2.6
which enhances cookie encryption/decryption by the optional usage of
PHP OpenSSL. Unfortunately PHP Mcrypt is not shipped by all Linux
distributions however PHP OpenSSL is often enabled by default.
PHP < 5.3.4 does not support passing an IV, thus this has been added as
a requirement. I could have used 'BF-CBC' rather 'AES-128-CBC' but Blowfish
(even it is fast) is seen by experts as weaker algorithm than
AES. If this should be a show-stopper for upstream merging just replace
'AES-128-CBC' by 'BF-CBC', please.

Patch adapted for 4.3.x and tests modified by Marc Delisle

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: d3fb6617f513fb97d4cc860863692072b5f8a1fd
      https://github.com/phpmyadmin/phpmyadmin/commit/d3fb6617f513fb97d4cc860863692072b5f8a1fd
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog
    M libraries/display_export.lib.php
    M libraries/operations.lib.php
    M po/az.po
    M tbl_export.php

  Log Message:
  -----------
  Merge branch 'QA_4_3' of https://github.com/phpmyadmin/phpmyadmin into QA_4_3


  Commit: d067ae7dd5f4cf58597f4a5182c0f7fa6a1cb0f5
      https://github.com/phpmyadmin/phpmyadmin/commit/d067ae7dd5f4cf58597f4a5182c0f7fa6a1cb0f5
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M ChangeLog

  Log Message:
  -----------
  ChangeLog entry

Signed-off-by: Marc Delisle <marc at infomarc.info>


  Commit: ed5fc179f497b31d2970ec8ede8649595f671c91
      https://github.com/phpmyadmin/phpmyadmin/commit/ed5fc179f497b31d2970ec8ede8649595f671c91
  Author: Marc Delisle <marc at infomarc.info>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

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

  Log Message:
  -----------
  Merge branch 'QA_4_3'


Compare: https://github.com/phpmyadmin/phpmyadmin/compare/b7e5b79ad4fa...ed5fc179f497