You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fu...@apache.org on 2012/07/07 02:26:08 UTC
svn commit: r1358480 - in /apr/apr/trunk/crypto: apr_md5.c apr_passwd.c
Author: fuankg
Date: Sat Jul 7 00:26:07 2012
New Revision: 1358480
URL: http://svn.apache.org/viewvc?rev=1358480&view=rev
Log:
Fix NetWare build with picky Metrowerks compiler.
Suggested by Stefan Fritsch.
Modified:
apr/apr/trunk/crypto/apr_md5.c
apr/apr/trunk/crypto/apr_passwd.c
Modified: apr/apr/trunk/crypto/apr_md5.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_md5.c?rev=1358480&r1=1358479&r2=1358480&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_md5.c (original)
+++ apr/apr/trunk/crypto/apr_md5.c Sat Jul 7 00:26:07 2012
@@ -468,7 +468,7 @@ APR_DECLARE(apr_status_t) apr_MD5InitEBC
* Define the Magic String prefix that identifies a password as being
* hashed using our algorithm.
*/
-static const char const *apr1_id = "$apr1$";
+static const char * const apr1_id = "$apr1$";
/*
* The following MD5 password encryption code was largely borrowed from
Modified: apr/apr/trunk/crypto/apr_passwd.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/crypto/apr_passwd.c?rev=1358480&r1=1358479&r2=1358480&view=diff
==============================================================================
--- apr/apr/trunk/crypto/apr_passwd.c (original)
+++ apr/apr/trunk/crypto/apr_passwd.c Sat Jul 7 00:26:07 2012
@@ -34,7 +34,7 @@
#include <pthread.h>
#endif
-static const char const *apr1_id = "$apr1$";
+static const char * const apr1_id = "$apr1$";
#if !defined(WIN32) && !defined(BEOS) && !defined(NETWARE)
#if defined(APU_CRYPT_THREADSAFE) || !APR_HAS_THREADS || \
@@ -177,7 +177,7 @@ APR_DECLARE(apr_status_t) apr_password_v
return (strcmp(sample, hash) == 0) ? APR_SUCCESS : APR_EMISMATCH;
}
-static const char const *bcrypt_id = "$2y$";
+static const char * const bcrypt_id = "$2y$";
APR_DECLARE(apr_status_t) apr_bcrypt_encode(const char *pw,
unsigned int count,
const unsigned char *salt,