diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 1999-03-14 01:16:45 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 1999-03-14 01:16:45 +0000 |
| commit | 199d59e5a1683aec183bf4eacbc096663357c46b (patch) | |
| tree | 5497c32bc3f690a6a503699c8dd0551035a29b89 | |
| parent | b29524c15b33fc5fbd630751226b896ac91967f8 (diff) | |
Remove some references which called malloc and free instead of Malloc and Free.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | STATUS | 4 | ||||
| -rw-r--r-- | crypto/des/enc_read.c | 7 | ||||
| -rw-r--r-- | crypto/des/enc_writ.c | 4 | ||||
| -rw-r--r-- | ssl/ssl_lib.c | 2 |
5 files changed, 14 insertions, 7 deletions
@@ -5,6 +5,10 @@ Changes between 0.9.1c and 0.9.2 + *) Remove some legacy and erroneous uses of malloc, free instead of + Malloc, Free. + [Lennart Bang <lob@netstream.se>, with minor changes by Steve] + *) Make rsa_oaep_test return non-zero on error. [Ulf Moeller <ulf@fitug.de>] @@ -1,6 +1,6 @@ OpenSSL STATUS Last modified at - ______________ $Date: 1999/03/10 16:17:31 $ + ______________ $Date: 1999/03/14 01:16:42 $ DEVELOPMENT STATE @@ -14,7 +14,7 @@ o Linux RH 5.1 Steve Henson OK o Linux 2.0 RH 5.2 Ralf S. Engelschall OK o Linux 2.2 RH 5.2 Peter 'Luna' Altberg OK - o WinNT VC++ 6.0 Peter 'Luna' Altberg troubles - see openssl-dev + o WinNT,95 VC++ 5 Steve Henson OK Proposed release time: Monday, March 15th 1999 diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c index 9fac3b24c1..265e9ca36f 100644 --- a/crypto/des/enc_read.c +++ b/crypto/des/enc_read.c @@ -58,6 +58,7 @@ #include <stdio.h> #include <errno.h> +#include "cryptlib.h" #include "des_locl.h" /* This has some uglies in it but it works - even over sockets. */ @@ -87,17 +88,17 @@ des_cblock iv; if (tmpbuf == NULL) { - tmpbuf=(char *)malloc(BSIZE); + tmpbuf=(char *)Malloc(BSIZE); if (tmpbuf == NULL) return(-1); } if (net == NULL) { - net=(unsigned char *)malloc(BSIZE); + net=(unsigned char *)Malloc(BSIZE); if (net == NULL) return(-1); } if (unnet == NULL) { - unnet=(char *)malloc(BSIZE); + unnet=(char *)Malloc(BSIZE); if (unnet == NULL) return(-1); } /* left over data from last decrypt */ diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c index 33ca700d71..96537ef584 100644 --- a/crypto/des/enc_writ.c +++ b/crypto/des/enc_writ.c @@ -58,6 +58,8 @@ #include <errno.h> #include <time.h> +#include <stdio.h> +#include "cryptlib.h" #include "des_locl.h" int des_enc_write(fd, buf, len, sched, iv) @@ -84,7 +86,7 @@ des_cblock iv; if (outbuf == NULL) { - outbuf=(char *)malloc(BSIZE+HDRSIZE); + outbuf=(char *)Malloc(BSIZE+HDRSIZE); if (outbuf == NULL) return(-1); } /* If we are sending less than 8 bytes, the same char will look diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c index 8c1166914c..1091ee1009 100644 --- a/ssl/ssl_lib.c +++ b/ssl/ssl_lib.c @@ -1019,7 +1019,7 @@ void SSL_CTX_free(SSL_CTX *a) if (a->extra_certs != NULL) sk_pop_free(a->extra_certs,X509_free); if (a->comp_methods != NULL) - sk_pop_free(a->comp_methods,free); + sk_pop_free(a->comp_methods,FreeFunc); Free((char *)a); } |