[openssl-commits] [openssl] master update
Matt Caswell
matt at openssl.org
Mon Jan 12 12:07:01 UTC 2015
The branch master has been updated
via 732192a0796c4ecbef3b13ccc8ee8ab23e28f483 (commit)
via 1211e29c168afcbde0ee277fa92e8d816abc350e (commit)
via 8e964419603d2478dfb391c66e7ccb2dcc9776b4 (commit)
from 264212b643c621d7e89079c1d2b76f87beec7ceb (commit)
- Log -----------------------------------------------------------------
commit 732192a0796c4ecbef3b13ccc8ee8ab23e28f483
Author: Matt Caswell <matt at openssl.org>
Date: Sun Jan 11 00:22:41 2015 +0000
Fix no-deprecated on Windows
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 1211e29c168afcbde0ee277fa92e8d816abc350e
Author: Matt Caswell <matt at openssl.org>
Date: Sun Jan 11 00:27:50 2015 +0000
make update
Reviewed-by: Richard Levitte <levitte at openssl.org>
commit 8e964419603d2478dfb391c66e7ccb2dcc9776b4
Author: Matt Caswell <matt at openssl.org>
Date: Sun Jan 11 00:26:38 2015 +0000
Remove redundant DSO_METHOD_beos declaration in dso.h. BEOS support has been
removed.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/dso/dso.h | 3 ---
crypto/ecdsa/Makefile | 13 +++++++------
util/libeay.num | 4 ++--
util/mk1mf.pl | 1 +
util/mkdef.pl | 1 +
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/crypto/dso/dso.h b/crypto/dso/dso.h
index 23a35e1..0e7d492 100644
--- a/crypto/dso/dso.h
+++ b/crypto/dso/dso.h
@@ -322,9 +322,6 @@ int DSO_pathbyaddr(void *addr,char *path,int sz);
* itself or libsocket. */
void *DSO_global_lookup(const char *name);
-/* If BeOS is defined, use shared images. If not, return NULL. */
-DSO_METHOD *DSO_METHOD_beos(void);
-
/* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run.
diff --git a/crypto/ecdsa/Makefile b/crypto/ecdsa/Makefile
index da08d2d..7730f71 100644
--- a/crypto/ecdsa/Makefile
+++ b/crypto/ecdsa/Makefile
@@ -127,15 +127,16 @@ ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
ecs_sign.o: ecs_locl.h ecs_sign.c
-ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
-ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
-ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
-ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
-ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
+ecs_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
+ecs_vrf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
+ecs_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
+ecs_vrf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
+ecs_vrf.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
+ecs_vrf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
-ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c
+ecs_vrf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ecs_locl.h ecs_vrf.c
diff --git a/util/libeay.num b/util/libeay.num
index bd57fbd..6859081 100755
--- a/util/libeay.num
+++ b/util/libeay.num
@@ -701,7 +701,7 @@ bn_mul_words 707 NOEXIST::FUNCTION:
BN_uadd 708 EXIST::FUNCTION:
BN_usub 709 EXIST::FUNCTION:
bn_sqr_words 710 NOEXIST::FUNCTION:
-_ossl_old_crypt 711 EXIST:!NeXT,!PERL5:FUNCTION:DES
+_ossl_old_crypt 711 EXIST:!PERL5:FUNCTION:DES
d2i_ASN1_BIT_STRING 712 EXIST::FUNCTION:
d2i_ASN1_BOOLEAN 713 EXIST::FUNCTION:
d2i_ASN1_HEADER 714 NOEXIST::FUNCTION:
@@ -3735,7 +3735,7 @@ EVP_PKEY_print_public 4118 EXIST::FUNCTION:
EVP_PKEY_CTX_new 4119 EXIST::FUNCTION:
i2d_TS_TST_INFO 4120 EXIST::FUNCTION:
EVP_PKEY_asn1_find 4121 EXIST::FUNCTION:
-DSO_METHOD_beos 4122 EXIST::FUNCTION:
+DSO_METHOD_beos 4122 NOEXIST::FUNCTION:
TS_CONF_load_cert 4123 EXIST::FUNCTION:
TS_REQ_get_ext 4124 EXIST::FUNCTION:
EVP_PKEY_sign_init 4125 EXIST::FUNCTION:
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index e83ef7d..08e0d3c 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -1465,6 +1465,7 @@ sub read_options
"no-zlib-dynamic" => 0,
"no-ssl-trace" => 0,
"no-unit-test" => 0,
+ "no-deprecated" => 0,
"fips" => \$fips,
"fipscanisterbuild" => [\$fips, \$fipscanisterbuild],
"fipscanisteronly" => [\$fips, \$fipscanisterbuild, \$fipscanisteronly],
diff --git a/util/mkdef.pl b/util/mkdef.pl
index ccd72f5..009d132 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -246,6 +246,7 @@ foreach (@ARGV, split(/ /, $options))
elsif (/^no-sctp$/) { $no_sctp=1; }
elsif (/^no-srtp$/) { $no_srtp=1; }
elsif (/^no-unit-test$/){ $no_unit_test=1; }
+ elsif (/^no-deprecated$/) { $no_deprecated=1; }
}
More information about the openssl-commits
mailing list