Skip to content

Commit 76d3395

Browse files
mickel8mickel8
committed
Don't require OpenSSL 3
1 parent 9b0bf6e commit 76d3395

File tree

6 files changed

+95
-61
lines changed

6 files changed

+95
-61
lines changed

‎bundlex.exs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ defmodule ExDTLS.BundlexProject do
1515
os_deps: [openssl: :pkg_config],
1616
libs: ["pthread"],
1717
interface: [:nif],
18-
compiler_flags: ["-DEXDTLS_DEBUG"],
18+
# compiler_flags: ["-DEXDTLS_DEBUG"],
1919
preprocessor: Unifex
2020
]
2121
]

‎c_src/ex_dtls/bio_frag.c‎

Lines changed: 67 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

22
#include "bio_frag.h"
3+
#include <openssl/bio.h>
34

45
static int bwrite(BIO *bio, const char *buf, int len);
56
static int bread(BIO *bio, char *buf, int len);
@@ -8,23 +9,16 @@ static int create(BIO *bio);
89
static int destroy(BIO *bio);
910
static long callback_ctrl(BIO *bio, int cmd, BIO_info_cb *fp);
1011

11-
// static const BIO_METHOD bio_methods = {
12-
// BIO_TYPE_BIO,
13-
// "DTLS fragmentation for mem BIO",
14-
// bwrite_conv,
15-
// bwrite,
16-
// bread_conv,
17-
// bread,
18-
// NULL,
19-
// NULL,
20-
// ctrl,
21-
// create,
22-
// destroy,
23-
// callback_ctrl
24-
// };
25-
2612
static BIO_METHOD *bio_methods = NULL;
2713

14+
#define MAX_FRAGS 100
15+
16+
struct Ctx {
17+
int frag_sizes[MAX_FRAGS];
18+
int witer;
19+
int riter;
20+
};
21+
2822
const BIO_METHOD *BIO_f_frag(void) {
2923
bio_methods = BIO_meth_new(BIO_TYPE_FILTER, "DTLS fragmentation for mem BIO");
3024

@@ -39,50 +33,99 @@ const BIO_METHOD *BIO_f_frag(void) {
3933
}
4034

4135
static int create(BIO *bio) {
42-
DEBUG("BIO frag create");
43-
// indicate that BIO initialization is complete
36+
struct Ctx *ctx = calloc(1, sizeof(struct Ctx));
37+
for (int i = 0; i < MAX_FRAGS; i++) {
38+
ctx->frag_sizes[i] = 0;
39+
}
40+
ctx->witer = 0;
41+
ctx->riter = 0;
42+
43+
BIO_set_data(bio, ctx);
4444
BIO_set_init(bio, 1);
4545
return 1;
4646
}
4747

4848
static int destroy(BIO *bio) {
49-
DEBUG("BIO frag destroy");
5049
if (bio == NULL) {
5150
return 0;
5251
}
5352

53+
struct Ctx *ctx = BIO_get_data(bio);
54+
free(ctx);
55+
BIO_set_data(bio, NULL);
5456
BIO_set_init(bio, 0);
5557
return 1;
5658
}
5759

5860
static int bread(BIO *bio, char *buf, int len) {
59-
DEBUG("BIO frag bread");
6061
BIO *next = BIO_next(bio);
6162
if (next == NULL) {
6263
return 0;
6364
}
6465

65-
return BIO_read(next, buf, len);
66+
struct Ctx *ctx = BIO_get_data(bio);
67+
68+
if (len != ctx->frag_sizes[ctx->riter]) {
69+
return 0;
70+
}
71+
72+
int ret = BIO_read(next, buf, len);
73+
74+
if (ret > 0) {
75+
if (ret == ctx->frag_sizes[ctx->riter]) {
76+
ctx->frag_sizes[ctx->riter] = 0;
77+
ctx->riter++;
78+
79+
if (ctx->riter == ctx->witer && ctx->frag_sizes[ctx->riter] == 0) {
80+
// reset iterators
81+
ctx->riter = 0;
82+
ctx->witer = 0;
83+
}
84+
85+
} else if (ret < ctx->frag_sizes[ctx->riter]) {
86+
ctx->frag_sizes[ctx->riter] -= ret;
87+
} else {
88+
// This should never happen
89+
return 0;
90+
}
91+
};
92+
93+
return ret;
6694
}
6795

6896
static int bwrite(BIO *bio, const char *buf, int len) {
69-
DEBUG("BIO frag bwrite %d", len);
7097
BIO *next = BIO_next(bio);
7198
if (next == NULL) {
7299
return 0;
73100
}
74101

75-
return BIO_write(next, buf, len);
102+
struct Ctx *ctx = BIO_get_data(bio);
103+
104+
if (ctx->witer >= MAX_FRAGS) {
105+
return 0;
106+
}
107+
108+
int ret = BIO_write(next, buf, len);
109+
if (ret > 0) {
110+
ctx->frag_sizes[ctx->witer] = ret;
111+
ctx->witer++;
112+
}
113+
114+
return ret;
76115
}
77116

78117
static long ctrl(BIO *bio, int cmd, long num, void *ptr) {
79-
DEBUG("BIO frag ctrl");
80-
81118
BIO *next = BIO_next(bio);
82119
if (next == NULL) {
83120
return 0;
84121
}
85122

123+
struct Ctx *ctx = BIO_get_data(bio);
124+
125+
if (cmd == BIO_CTRL_PENDING) {
126+
return ctx->frag_sizes[ctx->riter];
127+
}
128+
86129
return BIO_ctrl(next, cmd, num, ptr);
87130
}
88131

@@ -94,5 +137,3 @@ static long callback_ctrl(BIO *bio, int cmd, BIO_info_cb *fp) {
94137

95138
return BIO_callback_ctrl(next, cmd, fp);
96139
}
97-
98-

‎c_src/ex_dtls/dtls.c‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -35,46 +35,42 @@ SSL *create_ssl(SSL_CTX *ssl_ctx, int mode) {
3535
return NULL;
3636
}
3737

38-
// BIO *frag_bio = BIO_new(BIO_f_frag());
39-
// if (frag_bio == NULL) {
40-
// DEBUG("Cannot create frag bio");
41-
// return NULL;
42-
// }
38+
BIO *frag_bio = BIO_new(BIO_f_frag());
39+
if (frag_bio == NULL) {
40+
DEBUG("Cannot create frag bio");
41+
return NULL;
42+
}
4343

44-
// BIO *wmem_bio = BIO_new(BIO_s_mem());
45-
// if (wmem_bio == NULL) {
46-
// DEBUG("Cannot create write mem bio");
47-
// return NULL;
48-
// }
44+
BIO *wmem_bio = BIO_new(BIO_s_mem());
45+
if (wmem_bio == NULL) {
46+
DEBUG("Cannot create write mem bio");
47+
return NULL;
48+
}
4949

50-
// BIO *wchain = BIO_push(frag_bio, wmem_bio);
50+
BIO *wchain = BIO_push(frag_bio, wmem_bio);
5151

5252
BIO *rmem_bio = BIO_new(BIO_s_mem());
5353
if (rmem_bio == NULL) {
5454
DEBUG("Cannot create read mem bio");
5555
return NULL;
5656
}
5757

58-
BIO *rbio = BIO_new(BIO_s_dgram_mem());
59-
if (rbio == NULL) {
60-
DEBUG("Cannot create read dgram mem bio");
61-
return NULL;
62-
}
63-
64-
BIO *wbio = BIO_new(BIO_s_dgram_mem());
65-
if (wbio == NULL) {
66-
DEBUG("Cannot create write dgram mem bio");
67-
return NULL;
68-
}
58+
// #TODO Move to the BIO_s_dgram_mem once we require OpenSSL 3
59+
// BIO *rbio = BIO_new(BIO_s_dgram_mem());
60+
// if (rbio == NULL) {
61+
// DEBUG("Cannot create read dgram mem bio");
62+
// return NULL;
63+
// }
6964

70-
// SSL_set_bio(ssl, rmem_bio, wchain);
71-
SSL_set_bio(ssl, rbio, wbio);
72-
73-
// printf("Setting MTU to 1000\n");
74-
// if (SSL_set_mtu(ssl, 1500) == 0) {
65+
// BIO *wbio = BIO_new(BIO_s_dgram_mem());
66+
// if (wbio == NULL) {
67+
// DEBUG("Cannot create write dgram mem bio");
7568
// return NULL;
76-
// }
77-
69+
// }
70+
71+
SSL_set_bio(ssl, rmem_bio, wchain);
72+
// SSL_set_bio(ssl, rbio, wbio);
73+
7874
return ssl;
7975
}
8076

‎c_src/ex_dtls/native.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ int handle_load(UnifexEnv *env, void **priv_data) {
3434
UNIFEX_UNUSED(env);
3535
UNIFEX_UNUSED(priv_data);
3636

37-
if (OPENSSL_VERSION_NUMBER < 0x30000000L) {
38-
DEBUG("ExDTLS requires OpenSSL 3");
39-
return -1;
40-
}
41-
4237
FILE *urandom = fopen("/dev/urandom", "r");
4338
if (urandom == NULL) {
4439
DEBUG("Cannot open /dev/urandom");

‎test/integration_test.exs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
defmodule ExDTLS.IntegrationTest do
22
use ExUnit.Case, async: true
33

4+
@tag :debug
45
test "dtls_srtp" do
56
rx_dtls = ExDTLS.init(mode: :server, dtls_srtp: true, verify_peer: true)
67
tx_dtls = ExDTLS.init(mode: :client, dtls_srtp: true, verify_peer: true)

‎test/retransmission_test.exs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
defmodule ExDTLS.RetransmissionTest do
22
use ExUnit.Case, async: true
33

4+
@tag :debug
45
test "retransmission" do
56
rx_dtls = ExDTLS.init(mode: :server, dtls_srtp: true)
67
tx_dtls = ExDTLS.init(mode: :client, dtls_srtp: true)

0 commit comments

Comments
 (0)