ObjOpenSSL  Check-in [b9937d8663]

Overview
Comment:Fix compilation with GCC
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: b9937d8663b5eca12f77601f3519cae45fb49de1925b30c5288de2c10c253439
User & Date: js on 2017-08-01 19:03:59
Other Links: manifest | tags
Context
2017-08-01
19:14
Only check if SSL_OP_NO_SSLv2 is set if it is != 0 check-in: 481d9ee374 user: js tags: trunk
19:03
Fix compilation with GCC check-in: b9937d8663 user: js tags: trunk
18:49
Fix compilation with OpenSSL 1.1 check-in: ed3f707a5c user: js tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified src/SSLConnectionFailedException.h from [9ce0b3fc0f] to [9260d92004].

︙︙
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66

+ (instancetype)exceptionWithHost: (OFString *)host
			     port: (uint16_t)port
			   socket: (SSLSocket *)socket
			 SSLError: (unsigned long)SSLError
		     verifyResult: (long)verifyResult;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
	socket: (SSLSocket *)socket OF_UNAVAILABLE;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
	socket: (SSLSocket *)socket
	 errNo: (int)errNo OF_UNAVAILABLE;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
	socket: (SSLSocket *)socket
      SSLError: (unsigned long)SSLError;
- initWithHost: (OFString *)host
	  port: (uint16_t)port








|


|








49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66

+ (instancetype)exceptionWithHost: (OFString *)host
			     port: (uint16_t)port
			   socket: (SSLSocket *)socket
			 SSLError: (unsigned long)SSLError
		     verifyResult: (long)verifyResult;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
	socket: (id)socket OF_UNAVAILABLE;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
	socket: (id)socket
	 errNo: (int)errNo OF_UNAVAILABLE;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
	socket: (SSLSocket *)socket
      SSLError: (unsigned long)SSLError;
- initWithHost: (OFString *)host
	  port: (uint16_t)port
︙︙

Modified src/SSLSocket.h from [482ed92e1f] to [1ced025d5c].

︙︙
29
30
31
32
33
34
35

36
37
38
39
40
41
42

OF_ASSUME_NONNULL_BEGIN

@class X509Certificate;

@interface SSLSocket: OFTCPSocket <OFTLSSocket>
{
	SSL *_SSL;

	OFString *_certificateFile, *_privateKeyFile;
	const char *_privateKeyPassphrase;
	bool _certificateVerificationEnabled;
	bool _requestClientCertificatesEnabled;
}

@property (nonatomic, getter=isRequestClientCertificatesEnabled)








>








29
30
31
32
33
34
35
36
37
38
39
40
41
42
43

OF_ASSUME_NONNULL_BEGIN

@class X509Certificate;

@interface SSLSocket: OFTCPSocket <OFTLSSocket>
{
	SSL *_SSL;
	id <OFTLSSocketDelegate> _delegate;
	OFString *_certificateFile, *_privateKeyFile;
	const char *_privateKeyPassphrase;
	bool _certificateVerificationEnabled;
	bool _requestClientCertificatesEnabled;
}

@property (nonatomic, getter=isRequestClientCertificatesEnabled)
︙︙

Modified src/SSLSocket.m from [ab1d4e1a5d] to [65706beec9].

︙︙
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107

@interface SSLSocket ()
- (void)SSL_super_close;
@end

@implementation SSLSocket
@synthesize delegate = _delegate, certificateFile = _certificateFile;
@synthesize privateKeyFile = _privateKeyFile;
@synthesize privateKeyPassphrase = privateKeyPassphrase;
@synthesize certificateVerificationEnabled = _certificateVerificationEnabled;
@synthesize requestClientCertificatesEnabled =
    _requestClientCertificatesEnabled;

+ (void)load
{
	of_tls_socket_class = self;








|








93
94
95
96
97
98
99
100
101
102
103
104
105
106
107

@interface SSLSocket ()
- (void)SSL_super_close;
@end

@implementation SSLSocket
@synthesize delegate = _delegate, certificateFile = _certificateFile;
@synthesize privateKeyFile = _privateKeyFile;
@synthesize privateKeyPassphrase = _privateKeyPassphrase;
@synthesize certificateVerificationEnabled = _certificateVerificationEnabled;
@synthesize requestClientCertificatesEnabled =
    _requestClientCertificatesEnabled;

+ (void)load
{
	of_tls_socket_class = self;
︙︙