Commit 501dac77 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

If we don't have a prototype for crypt() we shouldn't 

be calling it.

Casting to the desired pointer return type hides the 
truncation of the return value when sizeof(ptr) > 
sizeof(int) and no prototype was included.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@393365 13f79535-47bb-0310-9956-ffa450edef68
parent 62f5a2fd

support/htdbm.c

+1 −1
Changes for support/htdbm.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ 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, (char *)crypt(htdbm->userpass, salt), sizeof(cpw) - 1);

            apr_cpystrn(cpw, crypt(htdbm->userpass, salt), sizeof(cpw) - 1);

            fprintf(stderr, "CRYPT is now deprecated, use MD5 instead!\n");

#endif

        default:

support/htpasswd.c

+1 −1
Changes for support/htpasswd.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int mkrecord(char *user, char *record, apr_size_t rlen, char *passwd, 
        to64(&salt[0], rand(), 8);

        salt[8] = '\0';



        apr_cpystrn(cpw, (char *)crypt(pw, salt), sizeof(cpw) - 1);

        apr_cpystrn(cpw, crypt(pw, salt), sizeof(cpw) - 1);

        break;

#endif

    }