Skip to content
This repository has been archived by the owner on Jan 8, 2020. It is now read-only.

Added some missing hash constants in Zend/Crypt/Key/Derivation/SaltedS2k #6781

Merged
merged 3 commits into from
Dec 10, 2014
Merged

Added some missing hash constants in Zend/Crypt/Key/Derivation/SaltedS2k #6781

merged 3 commits into from
Dec 10, 2014

Conversation

samsonasik
Copy link
Contributor

and patch some spelling. based on http://php.net/manual/en/mhash.constants.php . /cc @ezimuel

@froschdesign
Copy link
Member

@Ocramius
Looks good to me.
Can you merge this? Thanks!

Ocramius
Ocramius reviewed Dec 8, 2014
View reviewed changes
library/Zend/Crypt/Key/Derivation/SaltedS2k.php
@@ -26,13 +27,14 @@ class SaltedS2k
'ripemd128' => MHASH_RIPEMD128,
'ripemd256' => MHASH_RIPEMD256,
'ripemd320' => MHASH_RIPEMD320,
'haval128,3' => MHASH_HAVAL128,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about the previous keys? Isn't this going to be a BC break?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes... i think... but old key maybe because of typo... should i target to develop?

Warm regards,

Abdul Malik Ikhsan

Pada 9 Des 2014, pukul 05.50, Marco Pivetta notifications@github.com menulis:

In library/Zend/Crypt/Key/Derivation/SaltedS2k.php:

@@ -26,13 +27,14 @@ class SaltedS2k
'ripemd128' => MHASH_RIPEMD128,
'ripemd256' => MHASH_RIPEMD256,
'ripemd320' => MHASH_RIPEMD320,

  •    'haval128,3' => MHASH_HAVAL128,
    What about the previous keys? Isn't this going to be a BC break?

—
Reply to this email directly or view it on GitHub.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keeping the old values with a deprecation comment would be better, no?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ocramius done ;). I've added old values and add @deprecated comment ;)

@Ocramius Ocramius self-assigned this Dec 8, 2014
@Ocramius Ocramius added this to the 2.3.4 milestone Dec 10, 2014
Ocramius added a commit that referenced this pull request Dec 10, 2014
@Ocramius
Merge branch 'hotfix/#6781-add-missing-hash-algorithm-constants-for-s…
6b31836 
…alted-derivation-key' into develop

Close #6781
Forward port #6781
@Ocramius Ocramius merged commit bdcb740 into zendframework:master Dec 10, 2014
Ocramius added a commit that referenced this pull request Dec 10, 2014
@Ocramius
Merge branch 'hotfix/#6781-add-missing-hash-algorithm-constants-for-s…
0c20c71 
…alted-derivation-key'

Close #6781
@Ocramius
Copy link
Member

@samsonasik merged, thx!

master: 0c20c71
develop: 6b31836

@samsonasik samsonasik deleted the zendcrypt-constant branch December 10, 2014 01:54
gianarb pushed a commit to zendframework/zend-crypt that referenced this pull request May 15, 2015
@Ocramius
Merge branch 'hotfix/zendframework/zendframework#6781-add-missing-has…
cf06367 
…h-algorithm-constants-for-salted-derivation-key'

Close zendframework/zendframework#6781
gianarb pushed a commit to zendframework/zend-crypt that referenced this pull request May 15, 2015
@Ocramius
Merge branch 'hotfix/zendframework/zendframework#6781-add-missing-has…
fb6095e 
…h-algorithm-constants-for-salted-derivation-key' into develop

Close zendframework/zendframework#6781
Forward port zendframework/zendframework#6781
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@Ocramius Ocramius

Labels
Crypt enhancement
Projects
None yet
Milestone
2.3.4
Development

Successfully merging this pull request may close these issues.
3 participants
@samsonasik @froschdesign @Ocramius