Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add hmac_compute (Repost of #54164) #55506

Merged
merged 5 commits into from Dec 13, 2019
Merged

Add hmac_compute (Repost of #54164) #55506

merged 5 commits into from Dec 13, 2019

Conversation

Ajnbro
Copy link
Contributor

@Ajnbro Ajnbro commented Dec 3, 2019

What does this PR do?

Creates a util and a module called hmac_compute for computing a HMAC SHA256 hexdigest using a string and secret. Additionally, it updates the base64_encodestring and base64_decodestring util and module functions so that they are compatible with Python 3. This was previously accepted and labeled as merge ready in the PR referenced below; however, it was just closed because it was opened against the develop branch.

What issues does this PR fix or reference?

#54164

Tests written?

Yes

Commits signed with GPG?

Yes

@Ajnbro Ajnbro requested a review from as a code owner Dec 3, 2019
@ghost ghost requested a review from Akm0d Dec 3, 2019
@Akm0d Akm0d self-assigned this Dec 4, 2019
@Akm0d Akm0d added this to PR needs merge to master in PRs to port to master via automation Dec 4, 2019
@Akm0d Akm0d added this to the Approved milestone Dec 4, 2019
@Akm0d Akm0d requested a review from waynew Dec 4, 2019
Copy link
Contributor

@waynew waynew left a comment

If this is going into master, in particular if it's targeted to land before Sodium, we'll need to update this PR to maintain Python2 compatibility.

@Ajnbro Ajnbro requested a review from waynew Dec 5, 2019
@Ajnbro
Copy link
Contributor Author

@Ajnbro Ajnbro commented Dec 5, 2019

@waynew All done :)

waynew
waynew approved these changes Dec 5, 2019
Copy link
Contributor

@waynew waynew left a comment

Looks good, just needs a rebase onto master

salt/modules/hashutil.py Outdated Show resolved Hide resolved
salt/modules/hashutil.py Outdated Show resolved Hide resolved
salt/utils/hashutils.py Outdated Show resolved Hide resolved
@Ajnbro Ajnbro requested a review from dwoz Dec 10, 2019
Akm0d
Akm0d approved these changes Dec 12, 2019
@Akm0d
Copy link
Contributor

@Akm0d Akm0d commented Dec 13, 2019

re-run full macosxmojave

dwoz
dwoz approved these changes Dec 13, 2019
@dwoz dwoz merged commit 73b8ce0 into saltstack:master Dec 13, 2019
49 checks passed
PRs to port to master automation moved this from PR needs merge to master to PR merged Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Development

Successfully merging this pull request may close these issues.

None yet

4 participants