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

Merge r1862611, r1878703, r1884207, r1877693 from trunk: #408

Closed
wants to merge 1 commit into from

Conversation

notroj
Copy link
Collaborator

@notroj notroj commented Feb 2, 2024

Follow-up to 3928bbf

Merge r1862611, r1878703, r1884207, r1877693 from trunk:

* support/htpasswd.c (usage): Document SHA-256/512 support.

* support/htpasswd.c (usage): Fix typo.

Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.

What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not encrypting them, so fix the terminology in manpages, docs, --help, comments and function names.

Windows : do not include ap_config_auto.h

Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>, jorton, ylavic,
          steffenal

* support/htpasswd.c (usage): Document SHA-256/512 support.

* support/htpasswd.c (usage): Fix typo.

Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.

What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not
encrypting them, so fix the terminology in manpages, docs, --help, comments
and function names.

Windows : do not include ap_config_auto.h

Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>, jorton, ylavic,
          steffenal
asfgit pushed a commit that referenced this pull request Mar 5, 2024
* support/htpasswd.c (usage): Document SHA-256/512 support.

Windows : do not include ap_config_auto.h 

* support/htpasswd.c (usage): Fix typo. 

Fix misleading crypt vs hash terminology in ht* and dbmmanage tools.

What the htpasswd, htdbm and dbmmanage tools do is hashing passwords, not
encrypting them, so fix the terminology in manpages, docs, --help, comments
and function names.

Submitted by: Michele Preziuso <mpreziuso kaosdynamics.com>, jorton, steffenal, ylavic
Github: closes #408
Reviewed by: jorton, ylavic, jfclere


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1916129 13f79535-47bb-0310-9956-ffa450edef68
@notroj notroj closed this Mar 26, 2024
@notroj notroj deleted the 24x-sha2-part2 branch March 26, 2024 15:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant