diff options
| -rw-r--r-- | lib/libcrypto/bio/bss_fd.c | 9 | ||||
| -rw-r--r-- | lib/libcrypto/des/enc_read.c | 6 | ||||
| -rw-r--r-- | lib/libcrypto/des/enc_writ.c | 6 | ||||
| -rw-r--r-- | lib/libcrypto/x509/by_dir.c | 6 |
4 files changed, 4 insertions, 23 deletions
diff --git a/lib/libcrypto/bio/bss_fd.c b/lib/libcrypto/bio/bss_fd.c index 71abb4744a0..b21dbd92ed9 100644 --- a/lib/libcrypto/bio/bss_fd.c +++ b/lib/libcrypto/bio/bss_fd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bss_fd.c,v 1.17 2014/07/11 08:44:47 jsing Exp $ */ +/* $OpenBSD: bss_fd.c,v 1.18 2015/02/12 03:54:07 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -63,12 +63,6 @@ #include <openssl/opensslconf.h> -#if defined(OPENSSL_NO_POSIX_IO) -/* - * One can argue that one should implement dummy placeholder for - * BIO_s_fd here... - */ -#else #include <openssl/bio.h> static int fd_write(BIO *h, const char *buf, int num); @@ -271,4 +265,3 @@ BIO_fd_non_fatal_error(int err) } return (0); } -#endif diff --git a/lib/libcrypto/des/enc_read.c b/lib/libcrypto/des/enc_read.c index e4680af4f24..f5659150d3c 100644 --- a/lib/libcrypto/des/enc_read.c +++ b/lib/libcrypto/des/enc_read.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_read.c,v 1.14 2014/07/11 08:44:48 jsing Exp $ */ +/* $OpenBSD: enc_read.c,v 1.15 2015/02/12 03:54:07 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -88,9 +88,6 @@ int DES_rw_mode = DES_PCBC_MODE; int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, DES_cblock *iv) { -#if defined(OPENSSL_NO_POSIX_IO) - return(0); -#else /* data to be unencrypted */ int net_num=0; static unsigned char *net=NULL; @@ -228,6 +225,5 @@ int DES_enc_read(int fd, void *buf, int len, DES_key_schedule *sched, } } return num; -#endif /* OPENSSL_NO_POSIX_IO */ } diff --git a/lib/libcrypto/des/enc_writ.c b/lib/libcrypto/des/enc_writ.c index 0130c2c6d91..59f3878de92 100644 --- a/lib/libcrypto/des/enc_writ.c +++ b/lib/libcrypto/des/enc_writ.c @@ -1,4 +1,4 @@ -/* $OpenBSD: enc_writ.c,v 1.13 2014/10/22 13:02:04 jsing Exp $ */ +/* $OpenBSD: enc_writ.c,v 1.14 2015/02/12 03:54:07 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -82,9 +82,6 @@ int DES_enc_write(int fd, const void *_buf, int len, DES_key_schedule *sched, DES_cblock *iv) { -#if defined(OPENSSL_NO_POSIX_IO) - return (-1); -#else #ifdef _LIBC extern unsigned long time(); extern int write(); @@ -173,5 +170,4 @@ int DES_enc_write(int fd, const void *_buf, int len, } return(len); -#endif /* OPENSSL_NO_POSIX_IO */ } diff --git a/lib/libcrypto/x509/by_dir.c b/lib/libcrypto/x509/by_dir.c index 46003cb320f..032210424d9 100644 --- a/lib/libcrypto/x509/by_dir.c +++ b/lib/libcrypto/x509/by_dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: by_dir.c,v 1.35 2015/02/05 01:33:22 reyk Exp $ */ +/* $OpenBSD: by_dir.c,v 1.36 2015/02/12 03:54:07 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -70,9 +70,7 @@ #include <openssl/lhash.h> #include <openssl/x509.h> -#ifndef OPENSSL_NO_POSIX_IO # include <sys/stat.h> -#endif typedef struct lookup_dir_hashes_st { unsigned long hash; @@ -344,13 +342,11 @@ get_cert_by_subject(X509_LOOKUP *xl, int type, X509_NAME *name, (void) snprintf(b->data, b->max, "%s/%08lx.%s%d", ent->dir, h, postfix, k); -#ifndef OPENSSL_NO_POSIX_IO { struct stat st; if (stat(b->data, &st) < 0) break; } -#endif /* found one. */ if (type == X509_LU_X509) { if ((X509_load_cert_file(xl, b->data, |