Skip to content

Commit 879c4c3

Browse files
author
Shigeki Ohtsu
committed
deps: upgrade to HEAD of OpenSSL_1_0_1-stable
Use the current HEAD of OpenSSL_1_0_1-stable branch as the forthcoming openssl-1.0.1m and all sources are just extracted.
1 parent 2b63bcd commit 879c4c3

1,220 files changed

Lines changed: 284531 additions & 297587 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎deps/openssl/openssl/CHANGES‎

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

5+
Changes between 1.0.1l and 1.0.1m [xx XXX xxxx]
6+
7+
*) Removed the export ciphers from the DEFAULT ciphers
8+
[Kurt Roeckx]
9+
10+
Changes between 1.0.1k and 1.0.1l [15 Jan 2015]
11+
12+
*) Build fixes for the Windows and OpenVMS platforms
13+
[Matt Caswell and Richard Levitte]
14+
515
Changes between 1.0.1j and 1.0.1k [8 Jan 2015]
616

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

‎deps/openssl/openssl/Configure‎

Lines changed: 52 additions & 52 deletions
Large diffs are not rendered by default.

‎deps/openssl/openssl/MacOS/GetHTTPS.src/MacSocket.h‎

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -5,97 +5,98 @@
55
extern "C" {
66
#endif
77

8-
9-
10-
enum
11-
{
12-
kMacSocket_TimeoutErr = -2
8+
enum {
9+
kMacSocket_TimeoutErr = -2
1310
};
1411

12+
// Since MacSocket does busy waiting, I do a callback while waiting
1513

16-
// Since MacSocket does busy waiting, I do a callback while waiting
17-
18-
typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
14+
typedef OSErr(*MacSocket_IdleWaitCallback) (void *);
1915

20-
21-
// Call this before anything else!
16+
// Call this before anything else!
2217

2318
OSErr MacSocket_Startup(void);
2419

25-
26-
// Call this to cleanup before quitting
20+
// Call this to cleanup before quitting
2721

2822
OSErr MacSocket_Shutdown(void);
2923

24+
// Call this to allocate a "socket" (reference number is returned in
25+
// outSocketNum)
26+
// Note that inDoThreadSwitching is pretty much irrelevant right now, since I
27+
// ignore it
28+
// The inTimeoutTicks parameter is applied during reads/writes of data
29+
// The inIdleWaitCallback parameter specifies a callback which is called
30+
// during busy-waiting periods
31+
// The inUserRefPtr parameter is passed back to the idle-wait callback
3032

31-
// Call this to allocate a "socket" (reference number is returned in outSocketNum)
32-
// Note that inDoThreadSwitching is pretty much irrelevant right now, since I ignore it
33-
// The inTimeoutTicks parameter is applied during reads/writes of data
34-
// The inIdleWaitCallback parameter specifies a callback which is called during busy-waiting periods
35-
// The inUserRefPtr parameter is passed back to the idle-wait callback
36-
37-
OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);
38-
39-
40-
// Call this to connect to an IP/DNS address
41-
// Note that inTargetAddressAndPort is in "IP:port" format-- e.g. 10.1.1.1:123
42-
43-
OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
33+
OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
34+
const long inTimeoutTicks,
35+
MacSocket_IdleWaitCallback inIdleWaitCallback,
36+
void *inUserRefPtr);
4437

38+
// Call this to connect to an IP/DNS address
39+
// Note that inTargetAddressAndPort is in "IP:port" format-- e.g.
40+
// 10.1.1.1:123
4541

46-
// Call this to listen on a port
47-
// Since this a low-performance implementation, I allow a maximum of 1 (one!) incoming request when I listen
42+
OSErr MacSocket_connect(const int inSocketNum, char *inTargetAddressAndPort);
4843

49-
OSErr MacSocket_listen(const int inSocketNum,const int inPortNum);
44+
// Call this to listen on a port
45+
// Since this a low-performance implementation, I allow a maximum of 1 (one!)
46+
// incoming request when I listen
5047

48+
OSErr MacSocket_listen(const int inSocketNum, const int inPortNum);
5149

52-
// Call this to close a socket
50+
// Call this to close a socket
5351

5452
OSErr MacSocket_close(const int inSocketNum);
5553

54+
// Call this to receive data on a socket
55+
// Most parameters' purpose are obvious-- except maybe "inBlock" which
56+
// controls whether I wait for data or return immediately
5657

57-
// Call this to receive data on a socket
58-
// Most parameters' purpose are obvious-- except maybe "inBlock" which controls whether I wait for data or return immediately
58+
int MacSocket_recv(const int inSocketNum, void *outBuff, int outBuffLength,
59+
const Boolean inBlock);
5960

60-
int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const Boolean inBlock);
61+
// Call this to send data on a socket
6162

63+
int MacSocket_send(const int inSocketNum, const void *inBuff,
64+
int inBuffLength);
6265

63-
// Call this to send data on a socket
64-
65-
int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
66-
67-
68-
// If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
69-
// This function will let you check whether that's true or not
66+
// If zero bytes were read in a call to MacSocket_recv(), it may be that the
67+
// remote end has done a half-close
68+
// This function will let you check whether that's true or not
7069

7170
Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);
7271

73-
74-
// Call this to see if the listen has completed after a call to MacSocket_listen()
72+
// Call this to see if the listen has completed after a call to
73+
// MacSocket_listen()
7574

7675
Boolean MacSocket_ListenCompleted(const int inSocketNum);
7776

78-
79-
// These really aren't very useful anymore
77+
// These really aren't very useful anymore
8078

8179
Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
8280
Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);
8381

82+
// You may wish to change the userRefPtr for a socket callback-- use this to
83+
// do it
8484

85-
// You may wish to change the userRefPtr for a socket callback-- use this to do it
86-
87-
void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);
88-
89-
90-
// Call these to get the socket's IP:port descriptor
85+
void MacSocket_SetUserRefPtr(const int inSocketNum, void *inNewRefPtr);
9186

92-
void MacSocket_GetLocalIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
93-
void MacSocket_GetRemoteIPAndPort(const int inSocketNum,char *outIPAndPort,const int inIPAndPortLength);
87+
// Call these to get the socket's IP:port descriptor
9488

89+
void MacSocket_GetLocalIPAndPort(const int inSocketNum, char *outIPAndPort,
90+
const int inIPAndPortLength);
91+
void MacSocket_GetRemoteIPAndPort(const int inSocketNum, char *outIPAndPort,
92+
const int inIPAndPortLength);
9593

96-
// Call this to get error info from a socket
94+
// Call this to get error info from a socket
9795

98-
void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
96+
void MacSocket_GetSocketErrorInfo(const int inSocketNum,
97+
int *outSocketErrCode,
98+
char *outSocketErrString,
99+
const int inSocketErrStringMaxLength);
99100

100101

101102
#ifdef __cplusplus

‎deps/openssl/openssl/MacOS/Randomizer.h‎

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,42 @@
11

2-
// Gathers unpredictable system data to be used for generating
3-
// random bits
2+
// Gathers unpredictable system data to be used for generating
3+
// random bits
44

55
#include <MacTypes.h>
66

7-
class CRandomizer
8-
{
9-
public:
10-
CRandomizer (void);
11-
void PeriodicAction (void);
12-
13-
private:
14-
15-
// Private calls
16-
17-
void AddTimeSinceMachineStartup (void);
18-
void AddAbsoluteSystemStartupTime (void);
19-
void AddAppRunningTime (void);
20-
void AddStartupVolumeInfo (void);
21-
void AddFiller (void);
22-
23-
void AddCurrentMouse (void);
24-
void AddNow (double millisecondUncertainty);
25-
void AddBytes (void *data, long size, double entropy);
26-
27-
void GetTimeBaseResolution (void);
28-
unsigned long SysTimer (void);
29-
30-
// System Info
31-
bool mSupportsLargeVolumes;
32-
bool mIsPowerPC;
33-
bool mIs601;
34-
35-
// Time info
36-
double mTimebaseTicksPerMillisec;
37-
unsigned long mLastPeriodicTicks;
38-
39-
// Mouse info
40-
long mSamplePeriod;
41-
Point mLastMouse;
42-
long mMouseStill;
7+
class CRandomizer {
8+
public:
9+
CRandomizer(void);
10+
void PeriodicAction(void);
11+
12+
private:
13+
14+
// Private calls
15+
16+
void AddTimeSinceMachineStartup(void);
17+
void AddAbsoluteSystemStartupTime(void);
18+
void AddAppRunningTime(void);
19+
void AddStartupVolumeInfo(void);
20+
void AddFiller(void);
21+
22+
void AddCurrentMouse(void);
23+
void AddNow(double millisecondUncertainty);
24+
void AddBytes(void *data, long size, double entropy);
25+
26+
void GetTimeBaseResolution(void);
27+
unsigned long SysTimer(void);
28+
29+
// System Info
30+
bool mSupportsLargeVolumes;
31+
bool mIsPowerPC;
32+
bool mIs601;
33+
34+
// Time info
35+
double mTimebaseTicksPerMillisec;
36+
unsigned long mLastPeriodicTicks;
37+
38+
// Mouse info
39+
long mSamplePeriod;
40+
Point mLastMouse;
41+
long mMouseStill;
4342
};

‎deps/openssl/openssl/MacOS/_MWERKS_GUSI_prefix.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <MacHeaders.h>
22
#define B_ENDIAN
33
#ifdef __POWERPC__
4-
#pragma longlong on
4+
# pragma longlong on
55
#endif
66
#if 1
7-
#define MAC_OS_GUSI_SOURCE
7+
# define MAC_OS_GUSI_SOURCE
88
#endif
99
#define MONOLITH

‎deps/openssl/openssl/MacOS/_MWERKS_prefix.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#include <MacHeaders.h>
22
#define B_ENDIAN
33
#ifdef __POWERPC__
4-
#pragma longlong on
4+
# pragma longlong on
55
#endif
66
#if 0
7-
#define MAC_OS_GUSI_SOURCE
7+
# define MAC_OS_GUSI_SOURCE
88
#endif
99
#define MONOLITH

‎deps/openssl/openssl/MacOS/buildinf.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef MK1MF_BUILD
2-
# define CFLAGS "-DB_ENDIAN"
3-
# define PLATFORM "macos"
4-
# define DATE "Sun Feb 27 19:44:16 MET 2000"
2+
# define CFLAGS "-DB_ENDIAN"
3+
# define PLATFORM "macos"
4+
# define DATE "Sun Feb 27 19:44:16 MET 2000"
55
#endif

0 commit comments

Comments
 (0)