Skip to content

Commit deef605

Browse files
jasnellJulien Gilli
jasnell
authored and
Julien Gilli
committed
deps: update openssl to 1.0.1l
Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Timothy J Fontaine <[email protected]> Reviewed-By: Julien Gilli <[email protected]>
1 parent b28c76e commit deef605

File tree

17 files changed

+34
-81
lines changed

17 files changed

+34
-81
lines changed

‎deps/openssl/openssl/CHANGES

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
OpenSSL CHANGES
33
_______________
44

5+
Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
6+
7+
*) Build fixes for the Windows and OpenVMS platforms
8+
[Matt Caswell and Richard Levitte]
9+
510
Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
611

712
*) Fix DTLS segmentation fault in dtls1_get_record. A carefully crafted DTLS

‎deps/openssl/openssl/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.1k
7+
VERSION=1.0.1l
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0

‎deps/openssl/openssl/Makefile.bak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
## Makefile for OpenSSL
55
##
66

7-
VERSION=1.0.1k-dev
7+
VERSION=1.0.1l-dev
88
MAJOR=1
99
MINOR=0.1
1010
SHLIB_VERSION_NUMBER=1.0.0

‎deps/openssl/openssl/NEWS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
This file gives a brief overview of the major changes between each OpenSSL
66
release. For more details please read the CHANGES file.
77

8+
Major changes between OpenSSL 1.0.1k and OpenSSL 1.0.1l [15 Jan 2015]
9+
10+
o Build fixes for the Windows and OpenVMS platforms
11+
812
Major changes between OpenSSL 1.0.1j and OpenSSL 1.0.1k [8 Jan 2015]
913

1014
o Fix for CVE-2014-3571

‎deps/openssl/openssl/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
OpenSSL 1.0.1k 8 Jan 2015
2+
OpenSSL 1.0.1l 15 Jan 2015
33

44
Copyright (c) 1998-2011 The OpenSSL Project
55
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

‎deps/openssl/openssl/crypto/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ top:
5555
all: shared
5656

5757
buildinf.h: ../Makefile
58-
$(PERL) $(TOP)/util/mkbuildinf.pl "$(CFLAGS)" "$(PLATFORM)" >buildinf.h
58+
$(PERL) $(TOP)/util/mkbuildinf.pl "$(CC) $(CFLAGS)" "$(PLATFORM)" >buildinf.h
5959

6060
x86cpuid.s: x86cpuid.pl perlasm/x86asm.pl
6161
$(PERL) x86cpuid.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@

‎deps/openssl/openssl/crypto/cversion.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const char *SSLeay_version(int t)
7777
if (t == SSLEAY_CFLAGS)
7878
{
7979
#ifdef CFLAGS
80-
return(cflags);
80+
return(CFLAGS);
8181
#else
8282
return("compiler: information not available");
8383
#endif

‎deps/openssl/openssl/crypto/ecdsa/Makefile

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,16 +126,15 @@ ecs_sign.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
126126
ecs_sign.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
127127
ecs_sign.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
128128
ecs_sign.o: ecs_locl.h ecs_sign.c
129-
ecs_vrf.o: ../../e_os.h ../../include/openssl/asn1.h
130-
ecs_vrf.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
131-
ecs_vrf.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h
132-
ecs_vrf.o: ../../include/openssl/ec.h ../../include/openssl/ecdh.h
133-
ecs_vrf.o: ../../include/openssl/ecdsa.h ../../include/openssl/engine.h
134-
ecs_vrf.o: ../../include/openssl/err.h ../../include/openssl/evp.h
129+
ecs_vrf.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h
130+
ecs_vrf.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
131+
ecs_vrf.o: ../../include/openssl/e_os2.h ../../include/openssl/ec.h
132+
ecs_vrf.o: ../../include/openssl/ecdh.h ../../include/openssl/ecdsa.h
133+
ecs_vrf.o: ../../include/openssl/engine.h ../../include/openssl/evp.h
135134
ecs_vrf.o: ../../include/openssl/lhash.h ../../include/openssl/obj_mac.h
136135
ecs_vrf.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h
137136
ecs_vrf.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
138137
ecs_vrf.o: ../../include/openssl/pkcs7.h ../../include/openssl/safestack.h
139138
ecs_vrf.o: ../../include/openssl/sha.h ../../include/openssl/stack.h
140139
ecs_vrf.o: ../../include/openssl/symhacks.h ../../include/openssl/x509.h
141-
ecs_vrf.o: ../../include/openssl/x509_vfy.h ../cryptlib.h ecs_locl.h ecs_vrf.c
140+
ecs_vrf.o: ../../include/openssl/x509_vfy.h ecs_locl.h ecs_vrf.c

‎deps/openssl/openssl/crypto/ecdsa/ecs_vrf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
*/
5858

5959
#include "ecs_locl.h"
60-
#include "cryptlib.h"
60+
#include <string.h>
6161
#ifndef OPENSSL_NO_ENGINE
6262
#include <openssl/engine.h>
6363
#endif

‎deps/openssl/openssl/crypto/opensslv.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ extern "C" {
2929
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
3030
* major minor fix final patch/beta)
3131
*/
32-
#define OPENSSL_VERSION_NUMBER 0x100010bfL
32+
#define OPENSSL_VERSION_NUMBER 0x100010cfL
3333
#ifdef OPENSSL_FIPS
34-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1k-fips 8 Jan 2015"
34+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1l-fips 15 Jan 2015"
3535
#else
36-
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1k 8 Jan 2015"
36+
#define OPENSSL_VERSION_TEXT "OpenSSL 1.0.1l 15 Jan 2015"
3737
#endif
3838
#define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT
3939

‎deps/openssl/openssl/crypto/rand/rand_win.c

Lines changed: 2 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,6 @@ int RAND_poll(void)
196196
DWORD w;
197197
int good = 0;
198198

199-
/* Determine the OS version we are on so we can turn off things
200-
* that do not work properly.
201-
*/
202-
OSVERSIONINFO osverinfo ;
203-
osverinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO) ;
204-
GetVersionEx( &osverinfo ) ;
205199

206200
#if defined(OPENSSL_SYS_WINCE)
207201
# if defined(_WIN32_WCE) && _WIN32_WCE>=300
@@ -281,56 +275,6 @@ int RAND_poll(void)
281275
* at random times on Windows 2000. Reported by Jeffrey Altman.
282276
* Only use it on NT.
283277
*/
284-
/* Wolfgang Marczy <[email protected]> reports that
285-
* the RegQueryValueEx call below can hang on NT4.0 (SP6).
286-
* So we don't use this at all for now. */
287-
#if 0
288-
if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
289-
osverinfo.dwMajorVersion < 5)
290-
{
291-
/* Read Performance Statistics from NT/2000 registry
292-
* The size of the performance data can vary from call
293-
* to call so we must guess the size of the buffer to use
294-
* and increase its size if we get an ERROR_MORE_DATA
295-
* return instead of ERROR_SUCCESS.
296-
*/
297-
LONG rc=ERROR_MORE_DATA;
298-
char * buf=NULL;
299-
DWORD bufsz=0;
300-
DWORD length;
301-
302-
while (rc == ERROR_MORE_DATA)
303-
{
304-
buf = realloc(buf,bufsz+8192);
305-
if (!buf)
306-
break;
307-
bufsz += 8192;
308-
309-
length = bufsz;
310-
rc = RegQueryValueEx(HKEY_PERFORMANCE_DATA, TEXT("Global"),
311-
NULL, NULL, buf, &length);
312-
}
313-
if (rc == ERROR_SUCCESS)
314-
{
315-
/* For entropy count assume only least significant
316-
* byte of each DWORD is random.
317-
*/
318-
RAND_add(&length, sizeof(length), 0);
319-
RAND_add(buf, length, length / 4.0);
320-
321-
/* Close the Registry Key to allow Windows to cleanup/close
322-
* the open handle
323-
* Note: The 'HKEY_PERFORMANCE_DATA' key is implicitly opened
324-
* when the RegQueryValueEx above is done. However, if
325-
* it is not explicitly closed, it can cause disk
326-
* partition manipulation problems.
327-
*/
328-
RegCloseKey(HKEY_PERFORMANCE_DATA);
329-
}
330-
if (buf)
331-
free(buf);
332-
}
333-
#endif
334278

335279
if (advapi)
336280
{
@@ -383,7 +327,7 @@ int RAND_poll(void)
383327
if (advapi)
384328
FreeLibrary(advapi);
385329

386-
if ((osverinfo.dwPlatformId != VER_PLATFORM_WIN32_NT ||
330+
if ((!check_winnt() ||
387331
!OPENSSL_isservice()) &&
388332
(user = LoadLibrary(TEXT("USER32.DLL"))))
389333
{
@@ -407,8 +351,7 @@ int RAND_poll(void)
407351
* on NT4 even though it exists in SP3 (or SP6) and
408352
* higher.
409353
*/
410-
if ( osverinfo.dwPlatformId == VER_PLATFORM_WIN32_NT &&
411-
osverinfo.dwMajorVersion < 5)
354+
if (check_winnt() && !check_win_minplat(5))
412355
cursor = 0;
413356
}
414357
if (cursor)

‎deps/openssl/openssl/crypto/x509v3/v3_ncons.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ static int nc_dns(ASN1_IA5STRING *dns, ASN1_IA5STRING *base)
401401
if (dns->length > base->length)
402402
{
403403
dnsptr += dns->length - base->length;
404-
if (dnsptr[-1] != '.')
404+
if (*baseptr != '.' && dnsptr[-1] != '.')
405405
return X509_V_ERR_PERMITTED_VIOLATION;
406406
}
407407

‎deps/openssl/openssl/e_os.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,13 @@ static __inline unsigned int _strlen31(const char *str)
368368
# define DEFAULT_HOME "C:"
369369
# endif
370370

371-
/* Avoid Windows 8 SDK GetVersion deprecated problems */
371+
/* Avoid Visual Studio 13 GetVersion deprecated problems */
372372
#if defined(_MSC_VER) && _MSC_VER>=1800
373373
# define check_winnt() (1)
374+
# define check_win_minplat(x) (1)
374375
#else
375376
# define check_winnt() (GetVersion() < 0x80000000)
377+
# define check_win_minplat(x) (LOBYTE(LOWORD(GetVersion())) >= (x))
376378
#endif
377379

378380
#else /* The non-microsoft world */

‎deps/openssl/openssl/makevms.com

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ $ if (CFLAGS .nes. "") then CFLAGS = CFLAGS+ " "
646646
$ CFLAGS = CFLAGS+ "/DEFINE=ZLIB"
647647
$ endif
648648
$!
649-
$ WRITE H_FILE "#define CFLAGS"
649+
$ WRITE H_FILE "#define CFLAGS cflags"
650650
$ WRITE H_FILE "static const char cflags[] = ""compiler: ''CFLAGS'"";"
651651
$ WRITE H_FILE "#define PLATFORM ""platform: VMS ''ARCHD' ''VMS_VERSION'"""
652652
$ WRITE H_FILE "#define DATE ""built on: ''TIME'"" "

‎deps/openssl/openssl/openssl.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Release: 1
77
Summary: Secure Sockets Layer and cryptography libraries and tools
88
Name: openssl
99
#Version: %{libmaj}.%{libmin}.%{librel}
10-
Version: 1.0.1k
10+
Version: 1.0.1l
1111
Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
1212
License: OpenSSL
1313
Group: System Environment/Libraries

‎deps/openssl/openssl/util/mk1mf.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@
625625
printf OUT <<EOF;
626626
#ifdef $platform_cpp_symbol
627627
/* auto-generated/updated by util/mk1mf.pl for crypto/cversion.c */
628-
#define CFLAGS "$cc $cflags"
628+
#define CFLAGS "compiler: $cc $cflags"
629629
#define PLATFORM "$platform"
630630
EOF
631631
printf OUT " #define DATE \"%s\"\n", scalar gmtime();

‎deps/openssl/openssl/util/mkbuildinf.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
print <<"END_OUTPUT";
88
#ifndef MK1MF_BUILD
99
/* auto-generated by util/mkbuildinf.pl for crypto/cversion.c */
10-
#define CFLAGS
10+
#define CFLAGS cflags
1111
/*
1212
* Generate CFLAGS as an array of individual characters. This is a
1313
* workaround for the situation where CFLAGS gets too long for a C90 string

0 commit comments

Comments
 (0)