VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

* support/htpasswd.c (mkrecord): Handle crypt() failure.

Browse Source 
* support/htdbm.c (htdbm_make): Handle crypt() failure.

Submitted by: Paul Wouters <pwouters redhat.com>, jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1346905 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2012-06-06 14:20:27 +00:00
parent 9bb78757f2
commit 658147f2d2
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
support/htdbm.c
View File

@ -288,6 +288,9 @@ static apr_status_t htdbm_make(htdbm_t *htdbm)
{
char cpw[MAX_STRING_LEN];
char salt[9];
#if (!(defined(WIN32) || defined(NETWARE)))
char *cbuf;
#endif
switch (htdbm->alg) {
case ALG_APSHA:
@ -315,7 +318,15 @@ static apr_status_t htdbm_make(htdbm_t *htdbm)
(void) srand((int) time((time_t *) NULL));
to64(&salt[0], rand(), 8);
salt[8] = '\0';
apr_cpystrn(cpw, crypt(htdbm->userpass, salt), sizeof(cpw) - 1);
cbuf = crypt(htdbm->userpass, salt);
if (cbuf == NULL) {
char errbuf[128];
fprintf(stderr, "crypt() failed: %s\n",
apr_strerror(errno, errbuf, sizeof errbuf));
exit(ERR_PWMISMATCH);
}
apr_cpystrn(cpw, cbuf, sizeof(cpw) - 1);
fprintf(stderr, "CRYPT is now deprecated, use MD5 instead!\n");
#endif
default: