diff options
| author | Richard Levitte <levitte@openssl.org> | 2000-06-02 00:19:21 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2000-06-02 00:19:21 +0200 |
| commit | 26a3a48d65c7464b400ec1de439994d7f0d25fed (patch) | |
| tree | 91abb7d351b174e58f60e5353b731b916eaf0c5c /apps/passwd.c | |
| parent | Use NO_FP_API. (diff) | |
| download | openssl-26a3a48d65c7464b400ec1de439994d7f0d25fed.tar.xz openssl-26a3a48d65c7464b400ec1de439994d7f0d25fed.zip | |
There have been a number of complaints from a number of sources that names
like Malloc, Realloc and especially Free conflict with already existing names
on some operating systems or other packages. That is reason enough to change
the names of the OpenSSL memory allocation macros to something that has a
better chance of being unique, like prepending them with OPENSSL_.
This change includes all the name changes needed throughout all C files.
Diffstat (limited to 'apps/passwd.c')
| -rw-r--r-- | apps/passwd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/passwd.c b/apps/passwd.c index 4650ea503d..e991fefaa5 100644 --- a/apps/passwd.c +++ b/apps/passwd.c @@ -200,7 +200,7 @@ int MAIN(int argc, char **argv) passwd_malloc_size = pw_maxlen + 2; /* longer than necessary so that we can warn about truncation */ - passwd = passwd_malloc = Malloc(passwd_malloc_size); + passwd = passwd_malloc = OPENSSL_malloc(passwd_malloc_size); if (passwd_malloc == NULL) goto err; } @@ -266,9 +266,9 @@ int MAIN(int argc, char **argv) err: ERR_print_errors(bio_err); if (salt_malloc) - Free(salt_malloc); + OPENSSL_free(salt_malloc); if (passwd_malloc) - Free(passwd_malloc); + OPENSSL_free(passwd_malloc); if (in) BIO_free(in); if (out) @@ -399,7 +399,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, { if (*salt_malloc_p == NULL) { - *salt_p = *salt_malloc_p = Malloc(3); + *salt_p = *salt_malloc_p = OPENSSL_malloc(3); if (*salt_malloc_p == NULL) goto err; } @@ -422,7 +422,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p, if (*salt_malloc_p == NULL) { - *salt_p = *salt_malloc_p = Malloc(9); + *salt_p = *salt_malloc_p = OPENSSL_malloc(9); if (*salt_malloc_p == NULL) goto err; } |