Skip to content

Commit

Permalink
deps: upgrade to HEAD of OpenSSL_1_0_1-stable
Browse files Browse the repository at this point in the history
Use the current HEAD of OpenSSL_1_0_1-stable branch as the forthcoming
openssl-1.0.1m and all sources are just extracted.
  • Loading branch information
Shigeki Ohtsu committed Mar 18, 2015
1 parent 2b63bcd commit 879c4c3
Show file tree
Hide file tree
Showing 1,220 changed files with 284,531 additions and 297,587 deletions.
10 changes: 10 additions & 0 deletions deps/openssl/openssl/CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,16 @@
OpenSSL CHANGES
_______________

Changes between 1.0.1l and 1.0.1m [xx XXX xxxx]

*) Removed the export ciphers from the DEFAULT ciphers
[Kurt Roeckx]

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
Expand Down
104 changes: 52 additions & 52 deletions deps/openssl/openssl/Configure

Large diffs are not rendered by default.

107 changes: 54 additions & 53 deletions deps/openssl/openssl/MacOS/GetHTTPS.src/MacSocket.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,97 +5,98 @@
extern "C" {
#endif



enum
{
kMacSocket_TimeoutErr = -2
enum {
kMacSocket_TimeoutErr = -2
};

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

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

typedef OSErr (*MacSocket_IdleWaitCallback)(void *);
typedef OSErr(*MacSocket_IdleWaitCallback) (void *);


// Call this before anything else!
// Call this before anything else!

OSErr MacSocket_Startup(void);


// Call this to cleanup before quitting
// Call this to cleanup before quitting

OSErr MacSocket_Shutdown(void);

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

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

OSErr MacSocket_socket(int *outSocketNum,const Boolean inDoThreadSwitching,const long inTimeoutTicks,MacSocket_IdleWaitCallback inIdleWaitCallback,void *inUserRefPtr);


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

OSErr MacSocket_connect(const int inSocketNum,char *inTargetAddressAndPort);
OSErr MacSocket_socket(int *outSocketNum, const Boolean inDoThreadSwitching,
const long inTimeoutTicks,
MacSocket_IdleWaitCallback inIdleWaitCallback,
void *inUserRefPtr);

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

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

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

OSErr MacSocket_listen(const int inSocketNum, const int inPortNum);

// Call this to close a socket
// Call this to close a socket

OSErr MacSocket_close(const int inSocketNum);

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

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

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

int MacSocket_send(const int inSocketNum, const void *inBuff,
int inBuffLength);

// Call this to send data on a socket

int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);


// If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close
// This function will let you check whether that's true or not
// If zero bytes were read in a call to MacSocket_recv(), it may be that the
// remote end has done a half-close
// This function will let you check whether that's true or not

Boolean MacSocket_RemoteEndIsClosing(const int inSocketNum);


// Call this to see if the listen has completed after a call to MacSocket_listen()
// Call this to see if the listen has completed after a call to
// MacSocket_listen()

Boolean MacSocket_ListenCompleted(const int inSocketNum);


// These really aren't very useful anymore
// These really aren't very useful anymore

Boolean MacSocket_LocalEndIsOpen(const int inSocketNum);
Boolean MacSocket_RemoteEndIsOpen(const int inSocketNum);

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

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

void MacSocket_SetUserRefPtr(const int inSocketNum,void *inNewRefPtr);


// Call these to get the socket's IP:port descriptor
void MacSocket_SetUserRefPtr(const int inSocketNum, void *inNewRefPtr);

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

void MacSocket_GetLocalIPAndPort(const int inSocketNum, char *outIPAndPort,
const int inIPAndPortLength);
void MacSocket_GetRemoteIPAndPort(const int inSocketNum, char *outIPAndPort,
const int inIPAndPortLength);

// Call this to get error info from a socket
// Call this to get error info from a socket

void MacSocket_GetSocketErrorInfo(const int inSocketNum,int *outSocketErrCode,char *outSocketErrString,const int inSocketErrStringMaxLength);
void MacSocket_GetSocketErrorInfo(const int inSocketNum,
int *outSocketErrCode,
char *outSocketErrString,
const int inSocketErrStringMaxLength);


#ifdef __cplusplus
Expand Down
75 changes: 37 additions & 38 deletions deps/openssl/openssl/MacOS/Randomizer.h
Original file line number Diff line number Diff line change
@@ -1,43 +1,42 @@

// Gathers unpredictable system data to be used for generating
// random bits
// Gathers unpredictable system data to be used for generating
// random bits

#include <MacTypes.h>

class CRandomizer
{
public:
CRandomizer (void);
void PeriodicAction (void);

private:

// Private calls

void AddTimeSinceMachineStartup (void);
void AddAbsoluteSystemStartupTime (void);
void AddAppRunningTime (void);
void AddStartupVolumeInfo (void);
void AddFiller (void);

void AddCurrentMouse (void);
void AddNow (double millisecondUncertainty);
void AddBytes (void *data, long size, double entropy);

void GetTimeBaseResolution (void);
unsigned long SysTimer (void);

// System Info
bool mSupportsLargeVolumes;
bool mIsPowerPC;
bool mIs601;

// Time info
double mTimebaseTicksPerMillisec;
unsigned long mLastPeriodicTicks;

// Mouse info
long mSamplePeriod;
Point mLastMouse;
long mMouseStill;
class CRandomizer {
public:
CRandomizer(void);
void PeriodicAction(void);

private:

// Private calls

void AddTimeSinceMachineStartup(void);
void AddAbsoluteSystemStartupTime(void);
void AddAppRunningTime(void);
void AddStartupVolumeInfo(void);
void AddFiller(void);

void AddCurrentMouse(void);
void AddNow(double millisecondUncertainty);
void AddBytes(void *data, long size, double entropy);

void GetTimeBaseResolution(void);
unsigned long SysTimer(void);

// System Info
bool mSupportsLargeVolumes;
bool mIsPowerPC;
bool mIs601;

// Time info
double mTimebaseTicksPerMillisec;
unsigned long mLastPeriodicTicks;

// Mouse info
long mSamplePeriod;
Point mLastMouse;
long mMouseStill;
};
4 changes: 2 additions & 2 deletions deps/openssl/openssl/MacOS/_MWERKS_GUSI_prefix.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <MacHeaders.h>
#define B_ENDIAN
#ifdef __POWERPC__
#pragma longlong on
# pragma longlong on
#endif
#if 1
#define MAC_OS_GUSI_SOURCE
# define MAC_OS_GUSI_SOURCE
#endif
#define MONOLITH
4 changes: 2 additions & 2 deletions deps/openssl/openssl/MacOS/_MWERKS_prefix.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include <MacHeaders.h>
#define B_ENDIAN
#ifdef __POWERPC__
#pragma longlong on
# pragma longlong on
#endif
#if 0
#define MAC_OS_GUSI_SOURCE
# define MAC_OS_GUSI_SOURCE
#endif
#define MONOLITH
6 changes: 3 additions & 3 deletions deps/openssl/openssl/MacOS/buildinf.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef MK1MF_BUILD
# define CFLAGS "-DB_ENDIAN"
# define PLATFORM "macos"
# define DATE "Sun Feb 27 19:44:16 MET 2000"
# define CFLAGS "-DB_ENDIAN"
# define PLATFORM "macos"
# define DATE "Sun Feb 27 19:44:16 MET 2000"
#endif
Loading

0 comments on commit 879c4c3

Please sign in to comment.