From: Matt Caswell Date: Tue, 22 Mar 2016 11:34:32 +0000 (+0000) Subject: Add functions for creating BIO_METHODs X-Git-Tag: OpenSSL_1_1_0-pre5~215 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f334461facc4078adbad6552563f77799c174cab;p=oweals%2Fopenssl.git Add functions for creating BIO_METHODs BIO_METHODs are soon to be opaque so we need to have functions available to set them up. Reviewed-by: Richard Levitte --- diff --git a/crypto/bio/Makefile.in b/crypto/bio/Makefile.in index 12cf6c6792..f57d357fa9 100644 --- a/crypto/bio/Makefile.in +++ b/crypto/bio/Makefile.in @@ -20,14 +20,14 @@ LIBSRC= bio_lib.c bio_cb.c bio_err.c \ bss_file.c bss_sock.c bss_conn.c \ bf_null.c bf_buff.c b_print.c b_dump.c b_addr.c \ b_sock.c b_sock2.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c \ - bss_dgram.c + bss_dgram.c bio_meth.c # bf_lbuf.c LIBOBJ= bio_lib.o bio_cb.o bio_err.o \ bss_mem.o bss_null.o bss_fd.o \ bss_file.o bss_sock.o bss_conn.o \ bf_null.o bf_buff.o b_print.o b_dump.o b_addr.o \ b_sock.o b_sock2.o bss_acpt.o bf_nbio.o bss_log.o bss_bio.o \ - bss_dgram.o + bss_dgram.o bio_meth.o # bf_lbuf.o SRC= $(LIBSRC) diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c new file mode 100644 index 0000000000..3d337e91f3 --- /dev/null +++ b/crypto/bio/bio_meth.c @@ -0,0 +1,166 @@ +/* ==================================================================== + * Copyright (c) 2016 The OpenSSL Project. All rights reserved. + * + * 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 above 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 acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@OpenSSL.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED 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 OpenSSL PROJECT OR + * ITS 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. + * ==================================================================== + * + * This product includes cryptographic software written by Eric Young + * (eay@cryptsoft.com). This product includes software written by Tim + * Hudson (tjh@cryptsoft.com). + * + */ + +#include "bio_lcl.h" + +BIO_METHOD *BIO_meth_new(int type, const char *name) +{ + BIO_METHOD *biom = OPENSSL_zalloc(sizeof(BIO_METHOD)); + + if (biom != NULL) { + biom->type = type; + biom->name = name; + } + return biom; +} + +void BIO_meth_free(BIO_METHOD *biom) +{ + OPENSSL_free(biom); +} + +int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int) +{ + return biom->bwrite; +} + +int BIO_meth_set_write(BIO_METHOD *biom, + int (*write) (BIO *, const char *, int)) +{ + biom->bwrite = write; + return 1; +} + +int (*BIO_meth_get_read(BIO_METHOD *biom)) (BIO *, const char *, int) +{ + return biom->bread; +} + +int BIO_meth_set_read(BIO_METHOD *biom, + int (*read) (BIO *, const char *, int)) +{ + biom->bread = read; + return 1; +} + +int (*BIO_meth_get_puts(BIO_METHOD *biom)) (BIO *, const char *) +{ + return biom->bputs; +} + +int BIO_meth_set_puts(BIO_METHOD *biom, + int (*puts) (BIO *, const char *)) +{ + biom->bputs = puts; + return 1; +} + +int (*BIO_meth_get_gets(BIO_METHOD *biom)) (BIO *, char *, int) +{ + return biom->gets; +} + +int BIO_meth_set_gets(BIO_METHOD *biom, + int (*gets) (BIO *, char *, int)) +{ + biom->bgets = gets; + return 1; +} + +long (*BIO_meth_get_ctrl(BIO_METHOD *biom)) (BIO *, int, long, void *) +{ + return biom->ctrl; +} + +int BIO_meth_set_ctrl(BIO_METHOD *biom, + long (*ctrl) (BIO *, int, long, void *)) +{ + biom->ctrl = ctrl; + return 1; +} + +int (*BIO_meth_get_create(BIO_METHOD *bion)) (BIO *) +{ + return biom->create; +} + +int BIO_meth_set_create(BIO_METHOD *biom, int (*create) (BIO *)) +{ + biom->create = create; + return 1; +} + +int (*BIO_meth_get_destroy(BIO_METHOD *biom)) (BIO *) +{ + return biom->destroy; +} + +int BIO_meth_set_destroy(BIO_METHOD *biom, int (*destroy) (BIO *)) +{ + biom->destroy = destroy; + return 1; +} + +long (*BIO_meth_get_callback_ctrl(BIO_METHOD *biom)) (BIO *, int, bio_info_cb *) +{ + return biom->callback_ctrl; +} + +int BIO_meth_set_callback_ctrl(BIO_METHOD *biom, + long (*callback_ctrl) (BIO *, int, + bio_info_cb *)) +{ + biom->callback_ctrl = callback_ctrl; + return 1; +} diff --git a/crypto/bio/build.info b/crypto/bio/build.info index d976c6c7a4..f462c50ad0 100644 --- a/crypto/bio/build.info +++ b/crypto/bio/build.info @@ -5,5 +5,5 @@ SOURCE[../../libcrypto]=\ bss_file.c bss_sock.c bss_conn.c \ bf_null.c bf_buff.c b_print.c b_dump.c b_addr.c \ b_sock.c b_sock2.c bss_acpt.c bf_nbio.c bss_log.c bss_bio.c \ - bss_dgram.c \ + bss_dgram.c bio_meth.c \ {- $config{target} =~ /^VMS/i ? "bf_lbuf.c" : "" -}