diff options
Diffstat (limited to 'src/lib/libcrypto/des/enc_read.c')
-rw-r--r-- | src/lib/libcrypto/des/enc_read.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c index e7da2ec66b..edb6620d08 100644 --- a/src/lib/libcrypto/des/enc_read.c +++ b/src/lib/libcrypto/des/enc_read.c | |||
@@ -63,7 +63,7 @@ | |||
63 | 63 | ||
64 | /* This has some uglies in it but it works - even over sockets. */ | 64 | /* This has some uglies in it but it works - even over sockets. */ |
65 | /*extern int errno;*/ | 65 | /*extern int errno;*/ |
66 | OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode)=DES_PCBC_MODE; | 66 | OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode,DES_PCBC_MODE) |
67 | 67 | ||
68 | 68 | ||
69 | /* | 69 | /* |
@@ -87,6 +87,9 @@ OPENSSL_IMPLEMENT_GLOBAL(int,DES_rw_mode)=DES_PCBC_MODE; | |||
87 | int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, | 87 | int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, |
88 | DES_cblock *iv) | 88 | DES_cblock *iv) |
89 | { | 89 | { |
90 | #if defined(OPENSSL_NO_POSIX_IO) | ||
91 | return(0); | ||
92 | #else | ||
90 | /* data to be unencrypted */ | 93 | /* data to be unencrypted */ |
91 | int net_num=0; | 94 | int net_num=0; |
92 | static unsigned char *net=NULL; | 95 | static unsigned char *net=NULL; |
@@ -147,7 +150,7 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, | |||
147 | /* first - get the length */ | 150 | /* first - get the length */ |
148 | while (net_num < HDRSIZE) | 151 | while (net_num < HDRSIZE) |
149 | { | 152 | { |
150 | #ifndef _WIN32 | 153 | #ifndef OPENSSL_SYS_WIN32 |
151 | i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); | 154 | i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); |
152 | #else | 155 | #else |
153 | i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); | 156 | i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); |
@@ -173,7 +176,11 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, | |||
173 | net_num=0; | 176 | net_num=0; |
174 | while (net_num < rnum) | 177 | while (net_num < rnum) |
175 | { | 178 | { |
179 | #ifndef OPENSSL_SYS_WIN32 | ||
176 | i=read(fd,(void *)&(net[net_num]),rnum-net_num); | 180 | 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 | ||
177 | #ifdef EINTR | 184 | #ifdef EINTR |
178 | if ((i == -1) && (errno == EINTR)) continue; | 185 | if ((i == -1) && (errno == EINTR)) continue; |
179 | #endif | 186 | #endif |
@@ -228,5 +235,6 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, | |||
228 | } | 235 | } |
229 | } | 236 | } |
230 | return num; | 237 | return num; |
238 | #endif /* OPENSSL_NO_POSIX_IO */ | ||
231 | } | 239 | } |
232 | 240 | ||