Normalize line endings to LF on the files touched by the TLS fix
The previous commit picked up CRLF line endings from a Windows-side working copy used during development. Converting to plain LF to match the rest of this Linux-native repo - content unchanged, this is purely a line-ending normalization (932 insertions/932 deletions, 1:1).
This commit is contained in:
1 parent
701d03dcd9
commit
989aee9482
6 files changed
+932
-932
No files matched your search
@@ -1,68 +1,68 @@
|
||||
#ifndef __TLS_h__
|
||||
#define __TLS_h__
|
||||
|
||||
#include "ZString.h"
|
||||
#include "TLSInfo.h"
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
namespace core {
|
||||
|
||||
///
|
||||
/// TLS
|
||||
///
|
||||
/// This object provides the support methods to handle TLS on the server core and
|
||||
/// session environment.
|
||||
///
|
||||
|
||||
class TLS {
|
||||
|
||||
public:
|
||||
|
||||
///
|
||||
///
|
||||
///
|
||||
|
||||
TLS();
|
||||
|
||||
///
|
||||
/// Use this constructor when the SSL context needs to be created as when opening
|
||||
/// a server TCPSocket.
|
||||
///
|
||||
|
||||
TLS(TLSInfo *tlsInfo);
|
||||
|
||||
///
|
||||
/// Use this constructor on creation of a new TCPSocket that needs access to
|
||||
/// the generating server's SSL context.
|
||||
///
|
||||
|
||||
TLS(SSL_CTX *ctx);
|
||||
|
||||
///
|
||||
/// The destructor for this object.
|
||||
///
|
||||
|
||||
~TLS();
|
||||
|
||||
void createContext(TLSInfo *tlsInfo);
|
||||
|
||||
SSL_CTX *ctx;
|
||||
|
||||
protected:
|
||||
int receiveData(coreutils::ZString &buffer);
|
||||
int sendData(const char *data, int length);
|
||||
void registerSocket(int fd);
|
||||
void acceptSocket();
|
||||
|
||||
private:
|
||||
char *sip_cacert = (char *)"../testkeys/certs/pbxca.crt";
|
||||
char *sip_cert = (char *)"../testkeys/certs/pbxserver.crt";
|
||||
char *sip_key = (char *)"../testkeys/certs/pbxserver.key";
|
||||
bool initialized = false;
|
||||
SSL *ssl;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
#ifndef __TLS_h__
|
||||
#define __TLS_h__
|
||||
|
||||
#include "ZString.h"
|
||||
#include "TLSInfo.h"
|
||||
#include <openssl/ssl.h>
|
||||
|
||||
namespace core {
|
||||
|
||||
///
|
||||
/// TLS
|
||||
///
|
||||
/// This object provides the support methods to handle TLS on the server core and
|
||||
/// session environment.
|
||||
///
|
||||
|
||||
class TLS {
|
||||
|
||||
public:
|
||||
|
||||
///
|
||||
///
|
||||
///
|
||||
|
||||
TLS();
|
||||
|
||||
///
|
||||
/// Use this constructor when the SSL context needs to be created as when opening
|
||||
/// a server TCPSocket.
|
||||
///
|
||||
|
||||
TLS(TLSInfo *tlsInfo);
|
||||
|
||||
///
|
||||
/// Use this constructor on creation of a new TCPSocket that needs access to
|
||||
/// the generating server's SSL context.
|
||||
///
|
||||
|
||||
TLS(SSL_CTX *ctx);
|
||||
|
||||
///
|
||||
/// The destructor for this object.
|
||||
///
|
||||
|
||||
~TLS();
|
||||
|
||||
void createContext(TLSInfo *tlsInfo);
|
||||
|
||||
SSL_CTX *ctx;
|
||||
|
||||
protected:
|
||||
int receiveData(coreutils::ZString &buffer);
|
||||
int sendData(const char *data, int length);
|
||||
void registerSocket(int fd);
|
||||
void acceptSocket();
|
||||
|
||||
private:
|
||||
char *sip_cacert = (char *)"../testkeys/certs/pbxca.crt";
|
||||
char *sip_cert = (char *)"../testkeys/certs/pbxserver.crt";
|
||||
char *sip_key = (char *)"../testkeys/certs/pbxserver.key";
|
||||
bool initialized = false;
|
||||
SSL *ssl;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in new issue
Block a user