summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/des
diff options
context:
space:
mode:
authormiod <>2014-04-28 21:14:50 +0000
committermiod <>2014-04-28 21:14:50 +0000
commit5c80b04ad533e531e552e7e775b6df48dd1fcecc (patch)
treec38bc7b3eb96fe7a9e0e0ce7390f75e6feb8fc91 /src/lib/libcrypto/des
parent491ced77fa72fcec5b39051ff934a325810e0dd9 (diff)
downloadopenbsd-5c80b04ad533e531e552e7e775b6df48dd1fcecc.tar.gz
openbsd-5c80b04ad533e531e552e7e775b6df48dd1fcecc.tar.bz2
openbsd-5c80b04ad533e531e552e7e775b6df48dd1fcecc.zip
Remove WIN32, WIN64 and MINGW32 tentacles.
Also check for _LP64 rather than __arch64__ (the former being more reliable than __LP64__ or __arch64__) to tell 64-bit int platforms apart from 32-bit int platforms. Loosely based upon a diff from Martijn van Duren on tech@
Diffstat (limited to 'src/lib/libcrypto/des')
-rw-r--r--src/lib/libcrypto/des/enc_read.c8
-rw-r--r--src/lib/libcrypto/des/enc_writ.c4
2 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c
index 23ad458dcf..e1ac04c5b3 100644
--- a/src/lib/libcrypto/des/enc_read.c
+++ b/src/lib/libcrypto/des/enc_read.c
@@ -150,11 +150,7 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
150 /* first - get the length */ 150 /* first - get the length */
151 while (net_num < HDRSIZE) 151 while (net_num < HDRSIZE)
152 { 152 {
153#ifndef OPENSSL_SYS_WIN32
154 i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); 153 i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);
155#else
156 i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);
157#endif
158#ifdef EINTR 154#ifdef EINTR
159 if ((i == -1) && (errno == EINTR)) continue; 155 if ((i == -1) && (errno == EINTR)) continue;
160#endif 156#endif
@@ -176,11 +172,7 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched,
176 net_num=0; 172 net_num=0;
177 while (net_num < rnum) 173 while (net_num < rnum)
178 { 174 {
179#ifndef OPENSSL_SYS_WIN32
180 i=read(fd,(void *)&(net[net_num]),rnum-net_num); 175 i=read(fd,(void *)&(net[net_num]),rnum-net_num);
181#else
182 i=_read(fd,(void *)&(net[net_num]),rnum-net_num);
183#endif
184#ifdef EINTR 176#ifdef EINTR
185 if ((i == -1) && (errno == EINTR)) continue; 177 if ((i == -1) && (errno == EINTR)) continue;
186#endif 178#endif
diff --git a/src/lib/libcrypto/des/enc_writ.c b/src/lib/libcrypto/des/enc_writ.c
index 8f6b033c87..18562310ee 100644
--- a/src/lib/libcrypto/des/enc_writ.c
+++ b/src/lib/libcrypto/des/enc_writ.c
@@ -156,11 +156,7 @@ int DES_enc_write(int fd, const void *_buf, int len,
156 { 156 {
157 /* eay 26/08/92 I was not doing writing from where we 157 /* eay 26/08/92 I was not doing writing from where we
158 * got up to. */ 158 * got up to. */
159#ifndef _WIN32
160 i=write(fd,(void *)&(outbuf[j]),outnum-j); 159 i=write(fd,(void *)&(outbuf[j]),outnum-j);
161#else
162 i=_write(fd,(void *)&(outbuf[j]),outnum-j);
163#endif
164 if (i == -1) 160 if (i == -1)
165 { 161 {
166#ifdef EINTR 162#ifdef EINTR