Overview
Context
Changes
Modified Makefile
from [5fb05e53d5]
to [602b139ff6].
1
2
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
LIB = objopenssl
LIB_MAJOR = 0
LIB_MINOR = 0
CPPFLAGS += -Wall -g
LIBS += -lssl -lcrypto -lz
includedir = ObjGnuOpenSSL
prefix ?= /usr/local
INSTALL ?= install
LIB_PREFIX = `objfw-config --lib-prefix`
LIB_SUFFIX = `objfw-config --lib-suffix`
LIB_FILE = ${LIB_PREFIX}${LIB}${LIB_SUFFIX}
.SILENT:
all:
objfw-compile --lib ${LIB_MAJOR}.${LIB_MINOR} ${CPPFLAGS} ${LIBS} \
-o ${LIB} src/*.m
objfw-compile --lib 0.0 -o objopenssl *.m -lssl -lcrypto -lz -g -Wall
install: install-lib install-headers
install-lib: all
mkdir -p ${destdir}${prefix}/lib
export LIB_MAJOR=${LIB_MAJOR}; \
export LIB_MINOR=${LIB_MINOR}; \
echo "Installing ${LIB_FILE}..."; \
${INSTALL} -m 755 ${LIB_FILE} ${destdir}${prefix}/lib/${LIB_FILE}
install-headers:
mkdir -p ${destdir}${prefix}/include/${includedir}
cd src && for i in *.h; do \
echo "Installing $$i..."; \
install -m 644 $$i \
${destdir}${prefix}/include/${includedir}/$$i; \
done
clean:
export LIB_MAJOR=${LIB_MAJOR}; \
export LIB_MINOR=${LIB_MINOR}; \
for i in src/*.o ${LIB_FILE}; do \
echo "Deleting $$i..."; \
rm -f $$i; \
done
|
| | | | | | | | | | | | | | | | |
Deleted SSLSocket.h version [247b5540e4].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
#include <openssl/ssl.h>
#import <ObjFW/OFTCPSocket.h>
@interface SSLSocket: OFTCPSocket
{
SSL_CTX *ctx;
SSL *ssl;
BOOL handsShaken;
}
- initWithSocket: (OFTCPSocket*)socket;
/* Change the return type */
- (SSLSocket*)accept;
@end
|
Deleted SSLSocket.m version [81aea29e44].
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
#include <unistd.h>
#include <errno.h>
#include <assert.h>
#import <ObjFW/OFHTTPRequest.h>
#import "SSLSocket.h"
#import <ObjFW/OFAcceptFailedException.h>
#import <ObjFw/OFConnectionFailedException.h>
#import <ObjFW/OFInitializationFailedException.h>
#import <ObjFW/OFNotConnectedException.h>
#import <ObjFW/OFOutOfRangeException.h>
#import <ObjFW/OFReadFailedException.h>
#import <ObjFW/OFWriteFailedException.h>
#ifndef INVALID_SOCKET
# define INVALID_SOCKET -1
#endif
@implementation SSLSocket
+ (void)load
{
of_http_request_tls_socket_class = self;
}
+ (void)initialize
{
if (self == [SSLSocket class])
SSL_library_init();
}
- init
{
self = [super init];
@try {
if ((ctx = SSL_CTX_new(SSLv23_method())) == NULL)
@throw [OFInitializationFailedException
newWithClass: isa];
if ((SSL_CTX_set_options(ctx, SSL_OP_NO_SSLv2) &
SSL_OP_NO_SSLv2) == 0)
@throw [OFInitializationFailedException
newWithClass: isa];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- initWithSocket: (OFTCPSocket*)socket
{
self = [self init];
@try {
sock = dup(socket->sock);
if ((ssl = SSL_new(ctx)) == NULL || !SSL_set_fd(ssl, sock)) {
close(sock);
sock = INVALID_SOCKET;
@throw [OFInitializationFailedException
newWithClass: isa];
}
SSL_set_connect_state(ssl);
if (SSL_connect(ssl) != 1) {
close(sock);
sock = INVALID_SOCKET;
@throw [OFInitializationFailedException
newWithClass: isa];
}
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
SSL_CTX *ctx_ = ctx;
SSL *ssl_ = ssl;
[super dealloc];
if (ssl_ != NULL)
SSL_free(ssl_);
if (ctx_ != NULL)
SSL_CTX_free(ctx_);
}
- (void)connectToHost: (OFString*)host
onPort: (uint16_t)port
{
[super connectToHost: host
onPort: port];
if ((ssl = SSL_new(ctx)) == NULL || !SSL_set_fd(ssl, sock)) {
[super close];
@throw [OFConnectionFailedException newWithClass: isa
socket: self
host: host
port: port];
}
SSL_set_connect_state(ssl);
if (SSL_connect(ssl) != 1) {
[super close];
@throw [OFConnectionFailedException newWithClass: isa
socket: self
host: host
port: port];
}
}
- (SSLSocket*)accept
{
SSLSocket *newsock = (SSLSocket*)[super accept];
if ((ssl = SSL_new(ctx)) == NULL || !SSL_set_fd(ssl, sock)) {
[super close];
@throw [OFAcceptFailedException newWithClass: isa
socket: self];
}
SSL_set_accept_state(ssl);
if (SSL_connect(ssl) != 1) {
[super close];
@throw [OFAcceptFailedException newWithClass: isa
socket: self];
}
return newsock;
}
- (void)close
{
SSL_shutdown(ssl);
[super close];
}
- (size_t)_readNBytes: (size_t)size
intoBuffer: (char*)buf
{
ssize_t ret;
if (size > INT_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
if (sock == INVALID_SOCKET)
@throw [OFNotConnectedException newWithClass: isa
socket: self];
if (eos) {
OFReadFailedException *e;
e = [OFReadFailedException newWithClass: isa
stream: self
requestedSize: size];
#ifndef _WIN32
e->errNo = ENOTCONN;
#else
e->errNo = WSAENOTCONN;
#endif
@throw e;
}
if ((ret = SSL_read(ssl, buf, (int)size)) < 0)
@throw [OFReadFailedException newWithClass: isa
stream: self
requestedSize: size];
if (ret == 0)
eos = YES;
return ret;
}
- (size_t)_writeNBytes: (size_t)size
fromBuffer: (const char*)buf
{
ssize_t ret;
if (size > INT_MAX)
@throw [OFOutOfRangeException newWithClass: isa];
if (sock == INVALID_SOCKET)
@throw [OFNotConnectedException newWithClass: isa
socket: self];
if (eos) {
OFWriteFailedException *e;
e = [OFWriteFailedException newWithClass: isa
stream: self
requestedSize: size];
#ifndef _WIN32
e->errNo = ENOTCONN;
#else
e->errNo = WSAENOTCONN;
#endif
@throw e;
}
if ((ret = SSL_write(ssl, buf, (int)size)) < 1)
@throw [OFWriteFailedException newWithClass: isa
stream: self
requestedSize: size];
return ret;
}
@end
|
Added src/SSLSocket.h version [247b5540e4].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
#include <openssl/ssl.h>
#import <ObjFW/OFTCPSocket.h>
@interface SSLSocket: OFTCPSocket
{
SSL_CTX *ctx;
SSL *ssl;
BOOL handsShaken;
}
- initWithSocket: (OFTCPSocket*)socket;
/* Change the return type */
- (SSLSocket*)accept;
@end
|
| | | | | | | | | | | | | | |
Added src/SSLSocket.m version [81aea29e44].