svn commit: r277266 - in vendor-crypto/openssl/dist: . crypto crypto/ecdsa crypto/x509v3 util

Jung-uk Kim jkim at FreeBSD.org
Fri Jan 16 19:52:41 UTC 2015 

Author: jkim
Date: Fri Jan 16 19:52:36 2015
New Revision: 277266
URL: https://svnweb.freebsd.org/changeset/base/277266

Log:
  Import OpenSSL 1.0.1l.

Modified:
  vendor-crypto/openssl/dist/CHANGES
  vendor-crypto/openssl/dist/FREEBSD-upgrade
  vendor-crypto/openssl/dist/Makefile
  vendor-crypto/openssl/dist/NEWS
  vendor-crypto/openssl/dist/README
  vendor-crypto/openssl/dist/crypto/Makefile
  vendor-crypto/openssl/dist/crypto/ecdsa/Makefile
  vendor-crypto/openssl/dist/crypto/ecdsa/ecs_vrf.c
  vendor-crypto/openssl/dist/crypto/opensslv.h
  vendor-crypto/openssl/dist/crypto/x509v3/v3_ncons.c
  vendor-crypto/openssl/dist/e_os.h
  vendor-crypto/openssl/dist/util/mk1mf.pl

Modified: vendor-crypto/openssl/dist/CHANGES
==============================================================================
--- vendor-crypto/openssl/dist/CHANGES	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/CHANGES	Fri Jan 16 19:52:36 2015	(r277266)
@@ -2,6 +2,11 @@
  OpenSSL CHANGES
  _______________
 
+ Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
+
+  *) Build fixes for the Windows and OpenVMS platforms
+     [Matt Caswell and Richard Levitte]
+
  Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
 
   *) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS

Modified: vendor-crypto/openssl/dist/FREEBSD-upgrade
==============================================================================
--- vendor-crypto/openssl/dist/FREEBSD-upgrade	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/FREEBSD-upgrade	Fri Jan 16 19:52:36 2015	(r277266)
@@ -11,8 +11,8 @@ First, read http://wiki.freebsd.org/Subv
 # Xlist
 setenv XLIST /FreeBSD/work/openssl/svn-FREEBSD-files/FREEBSD-Xlist
 setenv FSVN "svn+ssh://svn.freebsd.org/base"
-setenv OSSLVER 1.0.1k
-# OSSLTAG format: v1_0_1k
+setenv OSSLVER 1.0.1l
+# OSSLTAG format: v1_0_1l
 
 ###setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
 

Modified: vendor-crypto/openssl/dist/Makefile
==============================================================================
--- vendor-crypto/openssl/dist/Makefile	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/Makefile	Fri Jan 16 19:52:36 2015	(r277266)
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.1k
+VERSION=1.0.1l
 MAJOR=1
 MINOR=0.1
 SHLIB_VERSION_NUMBER=1.0.0

Modified: vendor-crypto/openssl/dist/NEWS
==============================================================================
--- vendor-crypto/openssl/dist/NEWS	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/NEWS	Fri Jan 16 19:52:36 2015	(r277266)
@@ -5,6 +5,10 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
+  Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
+
+      o Build fixes for the Windows and OpenVMS platforms
+
   Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
 
       o Fix for CVE-2014-3571

Modified: vendor-crypto/openssl/dist/README
==============================================================================
--- vendor-crypto/openssl/dist/README	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/README	Fri Jan 16 19:52:36 2015	(r277266)
@@ -1,5 +1,5 @@
 
- OpenSSL 1.0.1k 8 Jan 2015
+ OpenSSL 1.0.1l 15 Jan 2015
 
  Copyright (c) 1998-2011 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

Modified: vendor-crypto/openssl/dist/crypto/Makefile
==============================================================================
--- vendor-crypto/openssl/dist/crypto/Makefile	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/crypto/Makefile	Fri Jan 16 19:52:36 2015	(r277266)
@@ -55,7 +55,7 @@ top:
 all: shared
 
 buildinf.h: ../Makefile
-	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h
+	$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
 
 x86cpuid.s:	x86cpuid.pl perlasm/x86asm.pl
 	$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

Modified: vendor-crypto/openssl/dist/crypto/ecdsa/Makefile
==============================================================================
--- vendor-crypto/openssl/dist/crypto/ecdsa/Makefile	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/crypto/ecdsa/Makefile	Fri Jan 16 19:52:36 2015	(r277266)
@@ -126,16 +126,15 @@ ecs_sign.o: ../../include/openssl/safest
 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: ../../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/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: ../../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 ../cryptlib.h ecs_locl.h ecs_vrf.c
+ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c

Modified: vendor-crypto/openssl/dist/crypto/ecdsa/ecs_vrf.c
==============================================================================
--- vendor-crypto/openssl/dist/crypto/ecdsa/ecs_vrf.c	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/crypto/ecdsa/ecs_vrf.c	Fri Jan 16 19:52:36 2015	(r277266)
@@ -57,7 +57,7 @@
  */
 
 #include "ecs_locl.h"
-#include "cryptlib.h"
+#include <string.h>
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif

Modified: vendor-crypto/openssl/dist/crypto/opensslv.h
==============================================================================
--- vendor-crypto/openssl/dist/crypto/opensslv.h	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/crypto/opensslv.h	Fri Jan 16 19:52:36 2015	(r277266)
@@ -29,11 +29,11 @@ extern "C" {
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x100010bfL
+#define OPENSSL_VERSION_NUMBER	0x100010cfL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1k-fips 8 Jan 2015"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1l-fips 15 Jan 2015"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1k 8 Jan 2015"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1l 15 Jan 2015"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 

Modified: vendor-crypto/openssl/dist/crypto/x509v3/v3_ncons.c
==============================================================================
--- vendor-crypto/openssl/dist/crypto/x509v3/v3_ncons.c	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/crypto/x509v3/v3_ncons.c	Fri Jan 16 19:52:36 2015	(r277266)
@@ -401,7 +401,7 @@ static int nc_dns(ASN1_IA5STRING *dns, A
 	if (dns->length > base->length)
 		{
 		dnsptr += dns->length - base->length;
-		if (dnsptr[-1] != '.')
+		if (*baseptr != '.' && dnsptr[-1] != '.')
 			return X509_V_ERR_PERMITTED_VIOLATION;
 		}
 

Modified: vendor-crypto/openssl/dist/e_os.h
==============================================================================
--- vendor-crypto/openssl/dist/e_os.h	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/e_os.h	Fri Jan 16 19:52:36 2015	(r277266)
@@ -368,11 +368,13 @@ static __inline unsigned int _strlen31(c
 #    define DEFAULT_HOME  "C:"
 #  endif
 
-/* Avoid Windows 8 SDK GetVersion deprecated problems */
+/* Avoid Visual Studio 13 GetVersion deprecated problems */
 #if defined(_MSC_VER) && _MSC_VER>=1800
 #  define check_winnt() (1)
+#  define check_win_minplat(x) (1)
 #else
 #  define check_winnt() (GetVersion() < 0x80000000)
+#  define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
 #endif
 
 #else /* The non-microsoft world */

Modified: vendor-crypto/openssl/dist/util/mk1mf.pl
==============================================================================
--- vendor-crypto/openssl/dist/util/mk1mf.pl	Fri Jan 16 19:49:10 2015	(r277265)
+++ vendor-crypto/openssl/dist/util/mk1mf.pl	Fri Jan 16 19:52:36 2015	(r277266)
@@ -625,7 +625,7 @@ open (OUT,">>crypto/buildinf.h") || die 
 printf OUT <<EOF;
 #ifdef $platform_cpp_symbol
   /* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
-  #define CFLAGS "$cc $cflags"
+  #define CFLAGS "compiler: $cc $cflags"
   #define PLATFORM "$platform"
 EOF
 printf OUT "  #define DATE \"%s\"\n", scalar gmtime();

More information about the svn-src-vendor mailing list