diff options
| author | deraadt <> | 2014-04-20 09:40:37 +0000 |
|---|---|---|
| committer | deraadt <> | 2014-04-20 09:40:37 +0000 |
| commit | a57df918c549c406a799babbb932e3dff0592084 (patch) | |
| tree | d7682afc3614776cd9675b2fee8bfa5319d5584d /src | |
| parent | 6249bd82c9cf637e8e84cccf990b7315b51a8fa6 (diff) | |
| download | openbsd-a57df918c549c406a799babbb932e3dff0592084.tar.gz openbsd-a57df918c549c406a799babbb932e3dff0592084.tar.bz2 openbsd-a57df918c549c406a799babbb932e3dff0592084.zip | |
Undo a calloc() replacement. It lacks the integer overflow check that
the system one has.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libssl/src/ssl/kssl.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/lib/libssl/src/ssl/kssl.c b/src/lib/libssl/src/ssl/kssl.c index b71753c191..26597f258e 100644 --- a/src/lib/libssl/src/ssl/kssl.c +++ b/src/lib/libssl/src/ssl/kssl.c | |||
| @@ -85,21 +85,8 @@ | |||
| 85 | #endif | 85 | #endif |
| 86 | 86 | ||
| 87 | 87 | ||
| 88 | /* memory allocation functions for non-temporary storage | ||
| 89 | * (e.g. stuff that gets saved into the kssl context) */ | ||
| 90 | static void* | ||
| 91 | kssl_calloc(size_t nmemb, size_t size) | ||
| 92 | { | ||
| 93 | void* p; | ||
| 94 | |||
| 95 | p = malloc(nmemb*size); | ||
| 96 | if (p){ | ||
| 97 | memset(p, 0, nmemb*size); | ||
| 98 | } | ||
| 99 | return p; | ||
| 100 | } | ||
| 101 | |||
| 102 | #define kssl_malloc(size) malloc((size)) | 88 | #define kssl_malloc(size) malloc((size)) |
| 89 | #define kssl_calloc(nmemb, size) calloc(nmemb, size) | ||
| 103 | #define kssl_realloc(ptr, size) realloc(ptr, size) | 90 | #define kssl_realloc(ptr, size) realloc(ptr, size) |
| 104 | #define kssl_free(ptr) free((ptr)) | 91 | #define kssl_free(ptr) free((ptr)) |
| 105 | 92 | ||
