apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1357979 - /apr/apr/trunk/crypto/apr_passwd.c
Date Thu, 05 Jul 2012 22:36:54 GMT
Author: sf
Date: Thu Jul  5 22:36:54 2012
New Revision: 1357979

URL: http://svn.apache.org/viewvc?rev=1357979&view=rev
Log:
fix breakage

Modified:
    apr/apr/trunk/crypto/apr_passwd.c

Modified: apr/apr/trunk/crypto/apr_passwd.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_passwd.c?rev=1357979&r1=1357978&r2=1357979&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_passwd.c (original)
+++ apr/apr/trunk/crypto/apr_passwd.c Thu Jul  5 22:36:54 2012
@@ -184,13 +184,11 @@ APR_DECLARE(apr_status_t) apr_bcrypt_enc
                                             apr_size_t salt_len,
                                             char *out, apr_size_t out_len)
 {
-    apr_size_t len;
     char setting[40];
     if (_crypt_gensalt_blowfish_rn(bcrypt_id, count, (const char *)salt,
                                    salt_len, setting, sizeof(setting)) == NULL)
         return APR_FROM_OS_ERROR(errno);
-    len = strlen(out);
-    if (_crypt_blowfish_rn(pw, setting, out, out_len - len) == NULL)
+    if (_crypt_blowfish_rn(pw, setting, out, out_len) == NULL)
         return APR_FROM_OS_ERROR(errno);
     return APR_SUCCESS;
 }



Mime
View raw message