Skip to content

perflib, handshake: do not use OSSL_LIB_CTX on OpenSSL < 3.0 #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
esyr wants to merge 1 commit into from
Closed

perflib, handshake: do not use OSSL_LIB_CTX on OpenSSL < 3.0 #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 26 additions & 3 deletions source/handshake.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

int err = 0;

#if OPENSSL_VERSION_NUMBER >= 0x30000000L
typedef enum {
INIT_LIB_CTX,
INIT_LIB_AND_SSL_CTX,
Expand All @@ -38,11 +39,13 @@ struct ctxs {
SSL_CTX *cctx;
};

static struct ctxs **ctx_pool = NULL;
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */

static SSL_CTX *sctx = NULL, *cctx = NULL;
static int share_ctx = 1;
static char *cert = NULL;
static char *privkey = NULL;
static struct ctxs **ctx_pool = NULL;

size_t *counts;

Expand All @@ -52,9 +55,11 @@ static long pool_size = 16;

typedef enum {
TC_SSL_CTX,
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
TC_OSSL_LIB_CTX_PER_THREAD,
TC_OSSL_LIB_CTX_POOL,
TC_SSL_CTX_POOL,
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
} test_case_t;
OSSL_TIME max_time;
static test_case_t test_case = TC_SSL_CTX;
Expand Down Expand Up @@ -105,6 +110,8 @@ static void do_handshake(size_t num)
err = 1;
}

#if OPENSSL_VERSION_NUMBER >= 0x30000000L

static void do_handshake_ossl_lib_ctx_per_thread(size_t num)
{
SSL *clientssl = NULL, *serverssl = NULL;
Expand Down Expand Up @@ -315,17 +322,21 @@ static int test_ossl_lib_ctx_pool(size_t threadcount, OSSL_TIME *duration)
free_ctx_pool();

return ret;
}
}

#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */

void usage(const char *progname)
{
printf("Usage: %s [options] certsdir threadcount\n", progname);
printf("-t - terse output\n");
printf("-s - disable context sharing\n");
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
printf("-p - use ossl_lib_ctx per thread\n");
printf("-P - use ossl_lib_ctx pool\n");
printf("-l - use ssl ctx pool\n");
printf("-o - set ossl_lib_ctx pool size\n");
#endif
printf("-S [n] - use secure memory\n");
}

Expand All @@ -342,14 +353,21 @@ int main(int argc, char * const argv[])
int p_flag = 0, P_flag = 0, l_flag = 0;
char *endptr = NULL;

while ((opt = getopt(argc, argv, "tspPo:lS:")) != -1) {
while ((opt = getopt(argc, argv,
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
"tspPo:lS:"
#else
"tsS:"
#endif
)) != -1) {
switch (opt) {
case 't':
terse = 1;
break;
case 's':
share_ctx = 0;
break;
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
case 'p':
p_flag = 1;
test_case = TC_OSSL_LIB_CTX_PER_THREAD;
Expand Down Expand Up @@ -381,6 +399,7 @@ int main(int argc, char * const argv[])
l_flag = 1;
test_case = TC_SSL_CTX_POOL;
break;
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
case 'S': {
char *end = NULL;
int sec_mem_size;
Expand Down Expand Up @@ -408,12 +427,14 @@ int main(int argc, char * const argv[])
}
}

#if OPENSSL_VERSION_NUMBER >= 0x30000000L
if ((p_flag + P_flag + l_flag) > 1) {
fprintf(stderr, "Error: -p, -P, and -l are mutually exclusive."
" Choose only one.\n\n");
usage(basename(argv[0]));
return EXIT_FAILURE;
}
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */

if (argv[optind] == NULL) {
printf("certsdir is missing\n");
Expand Down Expand Up @@ -461,6 +482,7 @@ int main(int argc, char * const argv[])
}
break;
}
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
case TC_OSSL_LIB_CTX_PER_THREAD: {
if (!perflib_run_multi_thread_test(do_handshake_ossl_lib_ctx_per_thread,
threadcount, &duration)) {
Expand All @@ -477,6 +499,7 @@ int main(int argc, char * const argv[])
}
break;
}
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
default:
fprintf(stderr, "Invalid test case\n");
goto err;
Expand Down
2 changes: 2 additions & 0 deletions source/perflib/perflib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,12 @@ int perflib_create_ssl_ctx_pair(const SSL_METHOD *sm, const SSL_METHOD *cm,
int min_proto_version, int max_proto_version,
SSL_CTX **sctx, SSL_CTX **cctx, char *certfile,
char *privkeyfile);
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
int perflib_create_ossl_lib_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
const SSL_METHOD *cm, int min_proto_version,
int max_proto_version, SSL_CTX **sctx, SSL_CTX **cctx,
char *certfile, char *privkeyfile);
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */
int perflib_create_ssl_objects(SSL_CTX *serverctx, SSL_CTX *clientctx,
SSL **sssl, SSL **cssl, BIO *s_to_c_fbio,
BIO *c_to_s_fbio);
Expand Down
2 changes: 2 additions & 0 deletions source/perflib/perfsslhelper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ static int perflib_use_certificate(SSL_CTX *serverctx, SSL_CTX *clientctx,
return 0;
}

#if OPENSSL_VERSION_NUMBER >= 0x30000000L
int perflib_create_ossl_lib_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
const SSL_METHOD *cm, int min_proto_version,
int max_proto_version, SSL_CTX **sctx, SSL_CTX **cctx,
Expand Down Expand Up @@ -90,6 +91,7 @@ int perflib_create_ossl_lib_ctx_pair(OSSL_LIB_CTX *libctx, const SSL_METHOD *sm,
err:
return 0;
}
#endif /* OPENSSL_VERSION_NUMBER >= 0x30000000L */

int perflib_create_ssl_ctx_pair(const SSL_METHOD *sm,
const SSL_METHOD *cm, int min_proto_version,
Expand Down