Commit 1f644005 authored by Richard Levitte's avatar Richard Levitte
Browse files

make update 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent 08590a86

apps/progs.h

+0 −2
Original line number Diff line number Diff line
@@ -214,9 +214,7 @@ static FUNCTION functions[] = { 
#ifndef OPENSSL_NO_MD4

    { FT_md, "md4", dgst_main},

#endif

#ifndef OPENSSL_NO_MD5

    { FT_md, "md5", dgst_main},

#endif

#ifndef OPENSSL_NO_GOST

    { FT_md, "gost", dgst_main},

#endif

crypto/bio/bio_err.c

+8 −53
Original line number Diff line number Diff line 
/* crypto/bio/bio_err.c */

/* ====================================================================

 * Copyright (c) 1999-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).

/*

 * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.

 *

 * Licensed under the OpenSSL license (the "License").  You may not use

 * this file except in compliance with the License.  You can obtain a copy

 * in the file LICENSE in the source distribution or at

 * https://www.openssl.org/source/license.html

*/



/*
@@ -96,6 +50,7 @@ static ERR_STRING_DATA BIO_str_functs[] = { 
    {ERR_FUNC(BIO_F_BIO_PARSE_HOSTSERV), "BIO_parse_hostserv"},

    {ERR_FUNC(BIO_F_BIO_PUTS), "BIO_puts"},

    {ERR_FUNC(BIO_F_BIO_READ), "BIO_read"},

    {ERR_FUNC(BIO_F_BIO_SET), "BIO_set"},

    {ERR_FUNC(BIO_F_BIO_SOCKET), "BIO_socket"},

    {ERR_FUNC(BIO_F_BIO_SOCKET_NBIO), "BIO_socket_nbio"},

    {ERR_FUNC(BIO_F_BIO_SOCK_INFO), "BIO_sock_info"},

include/openssl/bio.h

+1 −0
Original line number Diff line number Diff line
@@ -845,6 +845,7 @@ void ERR_load_BIO_strings(void); 
# define BIO_F_BIO_PARSE_HOSTSERV                         136

# define BIO_F_BIO_PUTS                                   110

# define BIO_F_BIO_READ                                   111

# define BIO_F_BIO_SET                                    143

# define BIO_F_BIO_SOCKET                                 140

# define BIO_F_BIO_SOCKET_NBIO                            142

# define BIO_F_BIO_SOCK_INFO                              141