diff options
author | beck <> | 2014-04-17 13:37:50 +0000 |
---|---|---|
committer | beck <> | 2014-04-17 13:37:50 +0000 |
commit | bddb7c686e3d1aeb156722adc64b6c35ae720f87 (patch) | |
tree | 7595a93a27385c367802aa17ecf20f96551cf14d /src/lib/libcrypto/des | |
parent | ecec66222d758996a4ff2671ca5026d9ede5ef76 (diff) | |
download | openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.gz openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.tar.bz2 openbsd-bddb7c686e3d1aeb156722adc64b6c35ae720f87.zip |
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r-- | src/lib/libcrypto/des/enc_read.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/des/enc_writ.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c index edb6620d08..23ad458dcf 100644 --- a/src/lib/libcrypto/des/enc_read.c +++ b/src/lib/libcrypto/des/enc_read.c | |||
@@ -106,17 +106,17 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, | |||
106 | 106 | ||
107 | if (tmpbuf == NULL) | 107 | if (tmpbuf == NULL) |
108 | { | 108 | { |
109 | tmpbuf=OPENSSL_malloc(BSIZE); | 109 | tmpbuf=malloc(BSIZE); |
110 | if (tmpbuf == NULL) return(-1); | 110 | if (tmpbuf == NULL) return(-1); |
111 | } | 111 | } |
112 | if (net == NULL) | 112 | if (net == NULL) |
113 | { | 113 | { |
114 | net=OPENSSL_malloc(BSIZE); | 114 | net=malloc(BSIZE); |
115 | if (net == NULL) return(-1); | 115 | if (net == NULL) return(-1); |
116 | } | 116 | } |
117 | if (unnet == NULL) | 117 | if (unnet == NULL) |
118 | { | 118 | { |
119 | unnet=OPENSSL_malloc(BSIZE); | 119 | unnet=malloc(BSIZE); |
120 | if (unnet == NULL) return(-1); | 120 | if (unnet == NULL) return(-1); |
121 | } | 121 | } |
122 | /* left over data from last decrypt */ | 122 | /* left over data from last decrypt */ |
diff --git a/src/lib/libcrypto/des/enc_writ.c b/src/lib/libcrypto/des/enc_writ.c index 2353ac1e89..8f6b033c87 100644 --- a/src/lib/libcrypto/des/enc_writ.c +++ b/src/lib/libcrypto/des/enc_writ.c | |||
@@ -98,7 +98,7 @@ int DES_enc_write(int fd, const void *_buf, int len, | |||
98 | 98 | ||
99 | if (outbuf == NULL) | 99 | if (outbuf == NULL) |
100 | { | 100 | { |
101 | outbuf=OPENSSL_malloc(BSIZE+HDRSIZE); | 101 | outbuf=malloc(BSIZE+HDRSIZE); |
102 | if (outbuf == NULL) return(-1); | 102 | if (outbuf == NULL) return(-1); |
103 | } | 103 | } |
104 | /* If we are sending less than 8 bytes, the same char will look | 104 | /* If we are sending less than 8 bytes, the same char will look |