[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Fri Apr 29 08:04:57 UTC 2016
The branch master has been updated
via 1f644005ac5f84536c2a80480bf6fdbdf1239f39 (commit)
via 08590a8647fe2586142451c2a9108388da629eb0 (commit)
from a14a740dbecf112ed9de53fb90f34f2af871cda9 (commit)
- Log -----------------------------------------------------------------
commit 1f644005ac5f84536c2a80480bf6fdbdf1239f39
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Apr 29 09:09:46 2016 +0200
make update
Reviewed-by: Matt Caswell <matt at openssl.org>
commit 08590a8647fe2586142451c2a9108388da629eb0
Author: Richard Levitte <levitte at openssl.org>
Date: Fri Apr 29 09:08:06 2016 +0200
apps/progs.pl: don't make digests disablable by default
Some digest algorithms can't be disabled, don't pretend they can.
Reviewed-by: Matt Caswell <matt at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
apps/progs.h | 2 --
apps/progs.pl | 2 +-
crypto/bio/bio_err.c | 61 +++++++--------------------------------------------
include/openssl/bio.h | 1 +
4 files changed, 10 insertions(+), 56 deletions(-)
diff --git a/apps/progs.h b/apps/progs.h
index 9cc2f2b..ac9d208 100644
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -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
diff --git a/apps/progs.pl b/apps/progs.pl
index e43d436..3ec16d5 100644
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -108,7 +108,7 @@ foreach my $cmd (
} elsif (my $disabler = $md_disabler{$cmd}) {
print "#ifndef OPENSSL_NO_".uc($disabler)."\n${str}#endif\n";
} else {
- print "#ifndef OPENSSL_NO_".uc($cmd)."\n${str}#endif\n";
+ print $str;
}
}
diff --git a/crypto/bio/bio_err.c b/crypto/bio/bio_err.c
index 36b9dfe..6bf1df6 100644
--- a/crypto/bio/bio_err.c
+++ b/crypto/bio/bio_err.c
@@ -1,57 +1,11 @@
-/* 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 at 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 at cryptsoft.com). This product includes software written by Tim
- * Hudson (tjh at 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
+*/
/*
* NOTE: this file was auto generated by the mkerr.pl script: any changes
@@ -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"},
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 6da37c0..42468b0 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -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
More information about the openssl-commits
mailing list