-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Stas did you ACK that change? It seems rather intrusive and I am not sure if we want that in a minor version just 24 h before releasing. can we solve that before tagging 5.4.4?
thx > On Tue, Jun 12, 2012 at 1:04 AM, Scott MacVicar <scott...@php.net> > wrote: >> Commit: bcd671d999bcb9aac3691c59e632d91575ea87a0 Author: >> Scott MacVicar <scott...@php.net> Mon, 11 Jun 2012 >> 16:04:01 -0700 Parents: >> aadf59dfa4be09147671de33786dc157716705df >> bccd1e672fabc3c788e93075221d47d9f077b167 Branches: master >> >> Link: >> http://git.php.net/?p=php-src.git;a=commitdiff;h=bcd671d999bcb9aac3691c59e632d91575ea87a0 >> >> >> Log: >> Merge branch '5.4' >> >> * 5.4: Rename openssl_pkcs5_pbkdf2_hmac() to something that >> doesn't sound like a spell. Add PBKDF2 support via openssl() >> >> Conflicts: ext/openssl/openssl.c >> >> Changed paths: MM ext/openssl/openssl.c >> >> >> Diff: diff --cc ext/openssl/openssl.c index >> f7db37b,4d482e8..d0ed15e --- a/ext/openssl/openssl.c +++ >> b/ext/openssl/openssl.c @@@ -3328,6 -3332,7 +3328,10 @@@ >> PHP_FUNCTION(openssl_pkey_get_details /* }}} */ >> >> #if OPENSSL_VERSION_NUMBER >= 0x10000000L ++<<<<<<< HEAD >> ++======= + ++>>>>>>> 5.4 /* {{{ proto string >> openssl_pbkdf2(string password, string salt, long key_length, >> long iterations [, string digest_method = "sha1"]) Generates a >> PKCS5 v2 PBKDF2 string, defaults to sha1 */ >> PHP_FUNCTION(openssl_pbkdf2) >> >> >> -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, >> visit: http://www.php.net/unsub.php >> > > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJP1z9hAAoJEKSanlo0ToXKTUMQAJH9+HTUMRuRGfHk6dvdK+3j d+fc447uDlNlxcMttgui1NDe7QdjDEkaKWFaKPvv6GIVTPYY4zzHM62okIzx+6V3 lzwbzRUCsER+9p1LD2pbIDNyxCbpenIeI6M1mLP5KfxFnsBx61ok0QghzKBjnnUQ Ci0IF8Ns5B5oj1Kmi5fqMrvgVNV1lRS0RjyiOGh0CyY+IYM1qqJ1VlrZ3LqyDb7s T+xx2MTpfvcyKSFHK1hEmooxYsReikqakJ5yC87k4jVAmSNDpuLDaibnUo/5o0aq 3ZRA8EoBUIeC+Ty0JF9MN+osZVmdD7cMd6q7h0e76HNupW/La2mdbKpQRy80P40N iH1v4HAX+N4k9Ut8bIjbViswWnEqoE/EY5ZSeLdYgR+W6J+R4abPfjR1I4KdLoCH /APyFwpcjGtErlaAPT8Z3iE+eelQ7a92WLz+yVWG70Qq8EG7HBV2234yTYJAsRlw GGDUMgGkmNxh+yCHyNGVqF8bO6Z4ghpUsz031pNhGRYlZrFFko5m9Is6VJsSN+g5 nNqi6xzdnCfVN5o2AZF/cvICO/NnWjpm2UI56gb14J4CtusvwDD8lek8MD+KQ+TQ /5T6JXtOkr8+BzkXna0e6/eqKqcxC34Kh2WuA2JsoUTkSDnK0UmPnP3ENfGnY6Uo SRlNfnuob0ebiLjC8DLN =ydGd -----END PGP SIGNATURE----- -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
