From 3339178a7b37aca236756b5c97ee1a4fe72c768f Mon Sep 17 00:00:00 2001 From: bcook <> Date: Wed, 3 Dec 2014 22:14:38 +0000 Subject: Move Windows OS-specific functions to make porting easier. Several functions that need to be redefined for a Windows port are right in the middle of other code that is relatively portable. This patch isolates the functions that need Windows-specific implementations so they can be built conditionally in the portable tree. ok jsing@ deraadt@ --- src/lib/libcrypto/bio/b_posix.c | 88 +++++++++++++++++++++++++++++++++ src/lib/libcrypto/bio/b_sock.c | 25 +--------- src/lib/libcrypto/crypto/Makefile | 10 ++-- src/lib/libssl/src/crypto/bio/b_posix.c | 88 +++++++++++++++++++++++++++++++++ src/lib/libssl/src/crypto/bio/b_sock.c | 25 +--------- 5 files changed, 183 insertions(+), 53 deletions(-) create mode 100644 src/lib/libcrypto/bio/b_posix.c create mode 100644 src/lib/libssl/src/crypto/bio/b_posix.c (limited to 'src/lib') diff --git a/src/lib/libcrypto/bio/b_posix.c b/src/lib/libcrypto/bio/b_posix.c new file mode 100644 index 0000000000..a850bc6aea --- /dev/null +++ b/src/lib/libcrypto/bio/b_posix.c @@ -0,0 +1,88 @@ +/* $OpenBSD: b_posix.c,v 1.1 2014/12/03 22:14:38 bcook Exp $ */ +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay@cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay@cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +/* + * Functions that need to be overridden by non-POSIX operating systems. + */ + +#include +#include + +#include + +int +BIO_sock_init(void) +{ + return (1); +} + +void +BIO_sock_cleanup(void) +{ +} + +int +BIO_socket_nbio(int s, int mode) +{ + int flags = fcntl(s, F_GETFD); + if (mode && !(flags & O_NONBLOCK)) + return (fcntl(s, F_SETFL, flags | O_NONBLOCK) != -1); + else if (!mode && (flags & O_NONBLOCK)) + return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1); + return (1); +} diff --git a/src/lib/libcrypto/bio/b_sock.c b/src/lib/libcrypto/bio/b_sock.c index 92a62b2c4c..ece88277df 100644 --- a/src/lib/libcrypto/bio/b_sock.c +++ b/src/lib/libcrypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.60 2014/12/03 21:55:51 bcook Exp $ */ +/* $OpenBSD: b_sock.c,v 1.61 2014/12/03 22:14:38 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,7 +65,6 @@ #include #include -#include #include #include #include @@ -193,17 +192,6 @@ BIO_gethostbyname(const char *name) return gethostbyname(name); } -int -BIO_sock_init(void) -{ - return (1); -} - -void -BIO_sock_cleanup(void) -{ -} - int BIO_socket_ioctl(int fd, long type, void *arg) { @@ -454,14 +442,3 @@ BIO_set_tcp_ndelay(int s, int on) { return (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) == 0); } - -int -BIO_socket_nbio(int s, int mode) -{ - int flags = fcntl(s, F_GETFD); - if (mode && !(flags & O_NONBLOCK)) - return (fcntl(s, F_SETFL, flags | O_NONBLOCK) != -1); - else if (!mode && (flags & O_NONBLOCK)) - return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1); - return (1); -} diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile index c6b7c6db46..f1e54659e6 100644 --- a/src/lib/libcrypto/crypto/Makefile +++ b/src/lib/libcrypto/crypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2014/11/20 19:19:09 miod Exp $ +# $OpenBSD: Makefile,v 1.51 2014/12/03 22:14:38 bcook Exp $ LIB= crypto @@ -58,7 +58,7 @@ SRCS+= bio_lib.c bio_cb.c bio_err.c SRCS+= bss_mem.c bss_null.c bss_fd.c SRCS+= bss_file.c bss_sock.c bss_conn.c SRCS+= bf_null.c bf_buff.c b_print.c b_dump.c -SRCS+= b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c +SRCS+= b_posix.c b_sock.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c SRCS+= bss_dgram.c # bn/ @@ -96,7 +96,7 @@ SRCS+= conf_err.c conf_lib.c conf_api.c conf_def.c conf_mod.c SRCS+= conf_mall.c conf_sap.c # des/ -SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c +SRCS+= cbc_cksm.c cbc_enc.c cfb64enc.c cfb_enc.c SRCS+= ecb3_enc.c ecb_enc.c enc_read.c enc_writ.c SRCS+= fcrypt.c ofb64enc.c ofb_enc.c pcbc_enc.c SRCS+= qud_cksm.c rand_key.c set_key.c xcbc_enc.c @@ -433,13 +433,13 @@ obj_dat.h: obj_mac.h .include "${.CURDIR}/arch/${MACHINE_CPU}/Makefile.inc" .else CFLAGS+=-DOPENSSL_NO_ASM -SRCS+= aes_core.c aes_cbc.c +SRCS+= aes_core.c aes_cbc.c SRCS+= bf_enc.c SRCS+= bn_asm.c SRCS+= camellia.c cmll_cbc.c cmll_misc.c SRCS+= des_enc.c fcrypt_b.c SRCS+= rc4_enc.c rc4_skey.c -#SRCS+= rc5_enc.c +#SRCS+= rc5_enc.c SRCS+= wp_block.c .endif diff --git a/src/lib/libssl/src/crypto/bio/b_posix.c b/src/lib/libssl/src/crypto/bio/b_posix.c new file mode 100644 index 0000000000..a850bc6aea --- /dev/null +++ b/src/lib/libssl/src/crypto/bio/b_posix.c @@ -0,0 +1,88 @@ +/* $OpenBSD: b_posix.c,v 1.1 2014/12/03 22:14:38 bcook Exp $ */ +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay@cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay@cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + +/* + * Functions that need to be overridden by non-POSIX operating systems. + */ + +#include +#include + +#include + +int +BIO_sock_init(void) +{ + return (1); +} + +void +BIO_sock_cleanup(void) +{ +} + +int +BIO_socket_nbio(int s, int mode) +{ + int flags = fcntl(s, F_GETFD); + if (mode && !(flags & O_NONBLOCK)) + return (fcntl(s, F_SETFL, flags | O_NONBLOCK) != -1); + else if (!mode && (flags & O_NONBLOCK)) + return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1); + return (1); +} diff --git a/src/lib/libssl/src/crypto/bio/b_sock.c b/src/lib/libssl/src/crypto/bio/b_sock.c index 92a62b2c4c..ece88277df 100644 --- a/src/lib/libssl/src/crypto/bio/b_sock.c +++ b/src/lib/libssl/src/crypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.60 2014/12/03 21:55:51 bcook Exp $ */ +/* $OpenBSD: b_sock.c,v 1.61 2014/12/03 22:14:38 bcook Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,7 +65,6 @@ #include #include -#include #include #include #include @@ -193,17 +192,6 @@ BIO_gethostbyname(const char *name) return gethostbyname(name); } -int -BIO_sock_init(void) -{ - return (1); -} - -void -BIO_sock_cleanup(void) -{ -} - int BIO_socket_ioctl(int fd, long type, void *arg) { @@ -454,14 +442,3 @@ BIO_set_tcp_ndelay(int s, int on) { return (setsockopt(s, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on)) == 0); } - -int -BIO_socket_nbio(int s, int mode) -{ - int flags = fcntl(s, F_GETFD); - if (mode && !(flags & O_NONBLOCK)) - return (fcntl(s, F_SETFL, flags | O_NONBLOCK) != -1); - else if (!mode && (flags & O_NONBLOCK)) - return (fcntl(s, F_SETFL, flags & ~O_NONBLOCK) != -1); - return (1); -} -- cgit v1.2.3-55-g6feb