diff options
| author | Andy Polyakov <appro@openssl.org> | 2008-12-22 13:54:12 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2008-12-22 13:54:12 +0000 |
| commit | e527201f6be3c295358bcc8b6bafec598f02dc97 (patch) | |
| tree | e3b3ea15baf24f50465ad652b13f418dcc26464d /crypto/des | |
| parent | 70531c147c2d38b03f109312a270ccc0af6cf8d6 (diff) | |
| download | openssl-e527201f6be3c295358bcc8b6bafec598f02dc97.tar.gz | |
This _WIN32-specific patch makes it possible to "wrap" OpenSSL in another
.DLL, in particular static build. The issue has been discussed in RT#1230
and later on openssl-dev, and mutually exclusive approaches were suggested.
This completes compromise solution suggested in RT#1230.
PR: 1230
Diffstat (limited to 'crypto/des')
| -rw-r--r-- | crypto/des/enc_read.c | 4 | ||||
| -rw-r--r-- | crypto/des/enc_writ.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/crypto/des/enc_read.c b/crypto/des/enc_read.c index b86620f568..372ef667b8 100644 --- a/crypto/des/enc_read.c +++ b/crypto/des/enc_read.c @@ -150,7 +150,11 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, /* first - get the length */ while (net_num < HDRSIZE) { +#ifndef _WIN32 i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); +#else + i=_read(fd,(void *)&(net[net_num]),HDRSIZE-net_num); +#endif #ifdef EINTR if ((i == -1) && (errno == EINTR)) continue; #endif diff --git a/crypto/des/enc_writ.c b/crypto/des/enc_writ.c index 6e25b6d4f0..2353ac1e89 100644 --- a/crypto/des/enc_writ.c +++ b/crypto/des/enc_writ.c @@ -156,7 +156,11 @@ int DES_enc_write(int fd, const void *_buf, int len, { /* eay 26/08/92 I was not doing writing from where we * got up to. */ +#ifndef _WIN32 i=write(fd,(void *)&(outbuf[j]),outnum-j); +#else + i=_write(fd,(void *)&(outbuf[j]),outnum-j); +#endif if (i == -1) { #ifdef EINTR |