svn commit: r277268 - in vendor-crypto/openssl/dist-0.9.8: . crypto crypto/ecdsa crypto/rand
Jung-uk Kim
jkim at FreeBSD.org
Fri Jan 16 19:56:00 UTC 2015
Author: jkim
Date: Fri Jan 16 19:55:55 2015
New Revision: 277268
URL: https://svnweb.freebsd.org/changeset/base/277268
Log:
Import OpenSSL 0.9.8ze.
Modified:
vendor-crypto/openssl/dist-0.9.8/CHANGES
vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade
vendor-crypto/openssl/dist-0.9.8/Makefile
vendor-crypto/openssl/dist-0.9.8/NEWS
vendor-crypto/openssl/dist-0.9.8/README
vendor-crypto/openssl/dist-0.9.8/crypto/cryptlib.c
vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/Makefile
vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/ecs_vrf.c
vendor-crypto/openssl/dist-0.9.8/crypto/opensslv.h
vendor-crypto/openssl/dist-0.9.8/crypto/rand/rand_win.c
vendor-crypto/openssl/dist-0.9.8/e_os.h
vendor-crypto/openssl/dist-0.9.8/openssl.spec
Modified: vendor-crypto/openssl/dist-0.9.8/CHANGES
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/CHANGES Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/CHANGES Fri Jan 16 19:55:55 2015 (r277268)
@@ -2,6 +2,11 @@
OpenSSL CHANGES
_______________
+ Changes between 0.9.8zd and 0.9.8ze [15 Jan 2015]
+
+ *) Build fixes for the Windows and OpenVMS platforms
+ [Matt Caswell and Richard Levitte]
+
Changes between 0.9.8zc and 0.9.8zd [8 Jan 2015]
*) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS
Modified: vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/FREEBSD-upgrade Fri Jan 16 19:55:55 2015 (r277268)
@@ -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 0.9.8zd
-# OSSLTAG format: v0_9_8zd
+setenv OSSLVER 0.9.8ze
+# OSSLTAG format: v0_9_8ze
###setenv OSSLTAG v`echo ${OSSLVER} | tr . _`
Modified: vendor-crypto/openssl/dist-0.9.8/Makefile
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/Makefile Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/Makefile Fri Jan 16 19:55:55 2015 (r277268)
@@ -4,7 +4,7 @@
## Makefile for OpenSSL
##
-VERSION=0.9.8zd
+VERSION=0.9.8ze
MAJOR=0
MINOR=9.8
SHLIB_VERSION_NUMBER=0.9.8
Modified: vendor-crypto/openssl/dist-0.9.8/NEWS
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/NEWS Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/NEWS Fri Jan 16 19:55:55 2015 (r277268)
@@ -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 0.9.8zd and OpenSSL 0.9.8ze [15 Jan 2015]
+
+ o Build fixes for the Windows and OpenVMS platforms
+
Major changes between OpenSSL 0.9.8zc and OpenSSL 0.9.8zd [8 Jan 2015]
o Fix for CVE-2014-3571
Modified: vendor-crypto/openssl/dist-0.9.8/README
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/README Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/README Fri Jan 16 19:55:55 2015 (r277268)
@@ -1,5 +1,5 @@
- OpenSSL 0.9.8zd 8 Jan 2015
+ OpenSSL 0.9.8ze 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-0.9.8/crypto/cryptlib.c
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/crypto/cryptlib.c Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/crypto/cryptlib.c Fri Jan 16 19:55:55 2015 (r277268)
@@ -512,7 +512,7 @@ void OPENSSL_showfatal (const char *fmta
#if defined(_WIN32_WINNT) && _WIN32_WINNT>=0x0333
/* this -------------v--- guards NT-specific calls */
- if (GetVersion() < 0x80000000 && OPENSSL_isservice() > 0)
+ if (check_winnt() && OPENSSL_isservice() > 0)
{ HANDLE h = RegisterEventSource(0,_T("OPENSSL"));
const TCHAR *pmsg=buf;
ReportEvent(h,EVENTLOG_ERROR_TYPE,0,0,0,1,0,&pmsg,0);
Modified: vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/Makefile
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/Makefile Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/Makefile Fri Jan 16 19:55:55 2015 (r277268)
@@ -128,12 +128,11 @@ 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/fips.h ../../include/openssl/lhash.h
ecs_vrf.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
ecs_vrf.o: ../../include/openssl/opensslconf.h ../../include/openssl/opensslv.h
@@ -141,4 +140,4 @@ ecs_vrf.o: ../../include/openssl/ossl_ty
ecs_vrf.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
ecs_vrf.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
ecs_vrf.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
-ecs_vrf.o: ../cryptlib.h ecs_locl.h ecs_vrf.c
+ecs_vrf.o: ecs_locl.h ecs_vrf.c
Modified: vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/ecs_vrf.c
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/ecs_vrf.c Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/crypto/ecdsa/ecs_vrf.c Fri Jan 16 19:55:55 2015 (r277268)
@@ -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-0.9.8/crypto/opensslv.h
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/crypto/opensslv.h Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/crypto/opensslv.h Fri Jan 16 19:55:55 2015 (r277268)
@@ -25,11 +25,11 @@
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta)
*/
-#define OPENSSL_VERSION_NUMBER 0x009081dfL
+#define OPENSSL_VERSION_NUMBER 0x009081efL
#ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8zd-fips 8 Jan 2015"
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8ze-fips 15 Jan 2015"
#else
-#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8zd 8 Jan 2015"
+#define OPENSSL_VERSION_TEXT "OpenSSL 0.9.8ze 15 Jan 2015"
#endif
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
Modified: vendor-crypto/openssl/dist-0.9.8/crypto/rand/rand_win.c
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/crypto/rand/rand_win.c Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/crypto/rand/rand_win.c Fri Jan 16 19:55:55 2015 (r277268)
@@ -196,12 +196,6 @@ int RAND_poll(void)
DWORD w;
int good = 0;
- /* Determine the OS version we are on so we can turn off things
- * that do not work properly.
- */
- OSVERSIONINFO osverinfo ;
- osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
- GetVersionEx( &osverinfo ) ;
#if defined(OPENSSL_SYS_WINCE)
# if defined(_WIN32_WCE) && _WIN32_WCE>=300
@@ -281,56 +275,6 @@ int RAND_poll(void)
* at random times on Windows 2000. Reported by Jeffrey Altman.
* Only use it on NT.
*/
- /* Wolfgang Marczy <WMarczy at topcall.co.at> reports that
- * the RegQueryValueEx call below can hang on NT4.0 (SP6).
- * So we don't use this at all for now. */
-#if 0
- if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
- osverinfo.dwMajorVersion < 5)
- {
- /* Read Performance Statistics from NT/2000 registry
- * The size of the performance data can vary from call
- * to call so we must guess the size of the buffer to use
- * and increase its size if we get an ERROR_MORE_DATA
- * return instead of ERROR_SUCCESS.
- */
- LONG rc=ERROR_MORE_DATA;
- char * buf=NULL;
- DWORD bufsz=0;
- DWORD length;
-
- while (rc == ERROR_MORE_DATA)
- {
- buf = realloc(buf,bufsz+8192);
- if (!buf)
- break;
- bufsz += 8192;
-
- length = bufsz;
- rc = RegQueryValueEx(HKEY_PERFORMANCE_DATA, TEXT("Global"),
- NULL, NULL, buf, &length);
- }
- if (rc == ERROR_SUCCESS)
- {
- /* For entropy count assume only least significant
- * byte of each DWORD is random.
- */
- RAND_add(&length, sizeof(length), 0);
- RAND_add(buf, length, length / 4.0);
-
- /* Close the Registry Key to allow Windows to cleanup/close
- * the open handle
- * Note: The 'HKEY_PERFORMANCE_DATA' key is implicitly opened
- * when the RegQueryValueEx above is done. However, if
- * it is not explicitly closed, it can cause disk
- * partition manipulation problems.
- */
- RegCloseKey(HKEY_PERFORMANCE_DATA);
- }
- if (buf)
- free(buf);
- }
-#endif
if (advapi)
{
@@ -383,7 +327,7 @@ int RAND_poll(void)
if (advapi)
FreeLibrary(advapi);
- if ((osverinfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
+ if ((!check_winnt() ||
!OPENSSL_isservice()) &&
(user = LoadLibrary(TEXT("USER32.DLL"))))
{
@@ -407,8 +351,7 @@ int RAND_poll(void)
* on NT4 even though it exists in SP3 (or SP6) and
* higher.
*/
- if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
- osverinfo.dwMajorVersion < 5)
+ if (check_winnt() && !check_win_minplat(5))
cursor = 0;
}
if (cursor)
@@ -750,7 +693,7 @@ static void readscreen(void)
int y; /* y-coordinate of screen lines to grab */
int n = 16; /* number of screen lines to grab at a time */
- if (GetVersion() < 0x80000000 && OPENSSL_isservice()>0)
+ if (check_winnt() && OPENSSL_isservice()>0)
return;
/* Create a screen DC and a memory DC compatible to screen DC */
Modified: vendor-crypto/openssl/dist-0.9.8/e_os.h
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/e_os.h Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/e_os.h Fri Jan 16 19:55:55 2015 (r277268)
@@ -360,6 +360,15 @@ static __inline unsigned int _strlen31(c
# define DEFAULT_HOME "C:"
# endif
+/* 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 */
# ifdef OPENSSL_SYS_VMS
Modified: vendor-crypto/openssl/dist-0.9.8/openssl.spec
==============================================================================
--- vendor-crypto/openssl/dist-0.9.8/openssl.spec Fri Jan 16 19:54:18 2015 (r277267)
+++ vendor-crypto/openssl/dist-0.9.8/openssl.spec Fri Jan 16 19:55:55 2015 (r277268)
@@ -6,7 +6,7 @@ Release: 1
Summary: Secure Sockets Layer and cryptography libraries and tools
Name: openssl
-Version: 0.9.8zd
+Version: 0.9.8ze
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
License: OpenSSL
Group: System Environment/Libraries
More information about the svn-src-all
mailing list