Skip to content

[OpenSSL 4 compatibility] Use accessors for opaque ASN1_STRING #136

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

Open
karljs wants to merge 3 commits into
base: main
Choose a base branch
from
Open

[OpenSSL 4 compatibility] Use accessors for opaque ASN1_STRING #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58fc884
Use accessors for opaque ASN1_STRING (OpenSSL 4 compatibility)
karljs Jul 24, 2026
a81af69
Use providers instead of the ENGINE API on OpenSSL 4 (est.h)
karljs Jul 24, 2026
8888a06
Port ossl_srv.c copies to OpenSSL 4
karljs Jul 24, 2026
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
69 changes: 41 additions & 28 deletions example/server/ossl_srv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@
#include <openssl/bio.h>
#include "apps.h" //taken from openssl/apps/apps.h

#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define ASN1_STRING_get0_data ASN1_STRING_data
#endif

extern BIO *bio_err;
BIO *cacerts = NULL;
static int msie_hack = 0;
Expand Down Expand Up @@ -317,6 +321,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
BIO_printf(err, "no keyfile specified\n");
goto end;
}
#if OPENSSL_VERSION_NUMBER < 0x40000000L
if (format == FORMAT_ENGINE) {
if (!e)
BIO_printf(err, "no engine specified\n");
Expand All @@ -330,6 +335,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
}
goto end;
}
#endif
key = BIO_new(BIO_s_file());
if (key == NULL) {
ERR_print_errors(err);
Expand Down Expand Up @@ -883,7 +889,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai) {
if (!btmp)
return 0;

if (!BN_pseudo_rand(btmp, SERIAL_RAND_BITS, 0, 0))
if (!BN_rand(btmp, SERIAL_RAND_BITS, 0, 0))
goto error;
if (ai && !BN_to_ASN1_INTEGER(btmp, ai))
goto error;
Expand Down Expand Up @@ -1304,14 +1310,14 @@ static int do_updatedb(CA_DB *db) {

/* get actual time and make a string */
a_tm = X509_gmtime_adj(a_tm, 0);
a_tm_s = (char *) OPENSSL_malloc(a_tm->length+1);
a_tm_s = (char *) OPENSSL_malloc(ASN1_STRING_length(a_tm)+1);
if (a_tm_s == NULL) {
cnt = -1;
goto err;
}

memcpy(a_tm_s, a_tm->data, a_tm->length);
a_tm_s[a_tm->length] = '\0';
memcpy(a_tm_s, ASN1_STRING_get0_data(a_tm), ASN1_STRING_length(a_tm));
a_tm_s[ASN1_STRING_length(a_tm)] = '\0';

if (strncmp(a_tm_s, "49", 2) <= 0)
a_y2k = 1;
Expand Down Expand Up @@ -1367,19 +1373,19 @@ int old_entry_print(BIO *bp, ASN1_OBJECT *obj, ASN1_STRING *str) {
*(pbuf++) = '\0';
BIO_puts(bp, buf);

if (str->type == V_ASN1_PRINTABLESTRING)
if (ASN1_STRING_type(str) == V_ASN1_PRINTABLESTRING)
BIO_printf(bp, "PRINTABLE:'");
else if (str->type == V_ASN1_T61STRING)
else if (ASN1_STRING_type(str) == V_ASN1_T61STRING)
BIO_printf(bp, "T61STRING:'");
else if (str->type == V_ASN1_IA5STRING)
else if (ASN1_STRING_type(str) == V_ASN1_IA5STRING)
BIO_printf(bp, "IA5STRING:'");
else if (str->type == V_ASN1_UNIVERSALSTRING)
else if (ASN1_STRING_type(str) == V_ASN1_UNIVERSALSTRING)
BIO_printf(bp, "UNIVERSALSTRING:'");
else
BIO_printf(bp, "ASN.1 %2d:'", str->type);
BIO_printf(bp, "ASN.1 %2d:'", ASN1_STRING_type(str));

p = (char *) str->data;
for (j = str->length; j > 0; j--) {
p = (char *) ASN1_STRING_get0_data(str);
for (j = ASN1_STRING_length(str); j > 0; j--) {
if ((*p >= ' ') && (*p <= '~'))
BIO_printf(bp, "%c", *p);
else if (*p & 0x80)
Expand Down Expand Up @@ -1505,16 +1511,22 @@ STACK_OF(OPENSSL_STRING) *sigopts, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));
#endif

if (str->type == V_ASN1_UNIVERSALSTRING)
if (ASN1_STRING_type(str) == V_ASN1_UNIVERSALSTRING)
ASN1_UNIVERSALSTRING_to_string(str);

if ((str->type == V_ASN1_IA5STRING)
&& (nid != NID_pkcs9_emailAddress))
str->type = V_ASN1_T61STRING;
if ((ASN1_STRING_type(str) == V_ASN1_IA5STRING)
&& (nid != NID_pkcs9_emailAddress)) {
X509_NAME_ENTRY_set_data(ne, V_ASN1_T61STRING,
ASN1_STRING_get0_data(str), ASN1_STRING_length(str));
str = X509_NAME_ENTRY_get_data(ne);
}

if ((nid == NID_pkcs9_emailAddress)
&& (str->type == V_ASN1_PRINTABLESTRING))
str->type = V_ASN1_IA5STRING;
&& (ASN1_STRING_type(str) == V_ASN1_PRINTABLESTRING)) {
X509_NAME_ENTRY_set_data(ne, V_ASN1_IA5STRING,
ASN1_STRING_get0_data(str), ASN1_STRING_length(str));
str = X509_NAME_ENTRY_get_data(ne);
}
}

/* If no EMAIL is wanted in the subject */
Expand All @@ -1523,17 +1535,18 @@ STACK_OF(OPENSSL_STRING) *sigopts, STACK_OF(CONF_VALUE) *policy, CA_DB *db,

/* check some things */
if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress)
&& (str->type != V_ASN1_IA5STRING)) {
&& (ASN1_STRING_type(str) != V_ASN1_IA5STRING)) {
BIO_printf(bio_err,
"\nemailAddress type needs to be of type IA5STRING\n");
goto err;
}
if ((str->type != V_ASN1_BMPSTRING)
&& (str->type != V_ASN1_UTF8STRING)) {
j = ASN1_PRINTABLE_type(str->data, str->length);
if (((j == V_ASN1_T61STRING) && (str->type != V_ASN1_T61STRING))
if ((ASN1_STRING_type(str) != V_ASN1_BMPSTRING)
&& (ASN1_STRING_type(str) != V_ASN1_UTF8STRING)) {
j = ASN1_PRINTABLE_type(ASN1_STRING_get0_data(str),
ASN1_STRING_length(str));
if (((j == V_ASN1_T61STRING) && (ASN1_STRING_type(str) != V_ASN1_T61STRING))
|| ((j == V_ASN1_IA5STRING)
&& (str->type == V_ASN1_PRINTABLESTRING))) {
&& (ASN1_STRING_type(str) == V_ASN1_PRINTABLESTRING))) {
BIO_printf(bio_err,
"\nThe string contains characters that are illegal for the ASN.1 type\n");
goto err;
Expand Down Expand Up @@ -1631,8 +1644,8 @@ STACK_OF(OPENSSL_STRING) *sigopts, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
BIO_printf(bio_err,
"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",
cv->name,
((str2 == NULL) ? "NULL" : (char *) str2->data),
((str == NULL) ? "NULL" : (char *) str->data));
((str2 == NULL) ? "NULL" : (char *) ASN1_STRING_get0_data(str2)),
((str == NULL) ? "NULL" : (char *) ASN1_STRING_get0_data(str)));
goto err;
}
} else {
Expand Down Expand Up @@ -1935,9 +1948,9 @@ STACK_OF(OPENSSL_STRING) *sigopts, STACK_OF(CONF_VALUE) *policy, CA_DB *db,
row[DB_type] = (char *) OPENSSL_malloc(2);

tm = X509_get_notAfter(ret);
row[DB_exp_date] = (char *) OPENSSL_malloc(tm->length+1);
memcpy(row[DB_exp_date], tm->data, tm->length);
row[DB_exp_date][tm->length] = '\0';
row[DB_exp_date] = (char *) OPENSSL_malloc(ASN1_STRING_length(tm)+1);
memcpy(row[DB_exp_date], ASN1_STRING_get0_data(tm), ASN1_STRING_length(tm));
row[DB_exp_date][ASN1_STRING_length(tm)] = '\0';

row[DB_rev_date] = NULL;

Expand Down
16 changes: 16 additions & 0 deletions src/est/est.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
#include <openssl/engine.h>
#include <openssl/conf.h>
#include <openssl/srp.h>
#if OPENSSL_VERSION_NUMBER >= 0x40000000L
#include <openssl/provider.h>
#endif

#ifdef __cplusplus
extern "C" {
Expand Down Expand Up @@ -829,6 +832,13 @@ LIBEST_API EST_ERROR est_disable_performance_timers(EST_CTX *ctx);
ENGINE_load_builtin_engines(); \
SSL_library_init(); \
SSL_load_error_strings(); } while (0)
#elif OPENSSL_VERSION_NUMBER >= 0x40000000L
#define est_apps_startup() \
do { ERR_load_crypto_strings(); \
OpenSSL_add_all_algorithms(); \
OSSL_PROVIDER_load(NULL, "default"); \
SSL_library_init(); \
SSL_load_error_strings(); } while (0)
#else
#define est_apps_startup() \
do { ERR_load_crypto_strings(); \
Expand All @@ -854,6 +864,12 @@ LIBEST_API EST_ERROR est_disable_performance_timers(EST_CTX *ctx);
CRYPTO_cleanup_all_ex_data(); \
ERR_remove_thread_state(NULL); \
ERR_free_strings(); } while (0)
#elif OPENSSL_VERSION_NUMBER >= 0x40000000L
#define est_apps_shutdown() \
do { CONF_modules_unload(1); \
OBJ_cleanup(); EVP_cleanup(); \
CRYPTO_cleanup_all_ex_data(); \
ERR_free_strings(); } while (0)
#else
#define est_apps_shutdown() \
do { CONF_modules_unload(1); \
Expand Down
8 changes: 6 additions & 2 deletions src/est/est_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5313,11 +5313,15 @@ EST_ERROR verify_voucher (EST_CTX *ctx)
return (EST_ERR_CLIENT_BRSKI_VOUCHER_VERIFY_FAILED);
}

#ifdef HAVE_OLD_OPENSSL
ctx->brski_retrieved_voucher = pkcs7->d.sign->contents->d.data->data;
ctx->brski_retrieved_voucher_len = pkcs7->d.sign->contents->d.data->length;
#else
ctx->brski_retrieved_voucher = (unsigned char *)ASN1_STRING_get0_data(pkcs7->d.sign->contents->d.data);
#endif
ctx->brski_retrieved_voucher_len = ASN1_STRING_length(pkcs7->d.sign->contents->d.data);

EST_LOG_INFO("Voucher verify passed. Voucher =\n %s",
pkcs7->d.sign->contents->d.data->data);
ctx->brski_retrieved_voucher);

return (EST_ERR_NONE);
}
Expand Down
4 changes: 4 additions & 0 deletions src/est/est_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,11 @@ int est_tls_uid_auth (EST_CTX *ctx, SSL *ssl, X509_REQ *req)
*/
tls_uid = est_get_tls_uid(ssl, &uid_len, 0);
if (tls_uid) {
#ifdef HAVE_OLD_OPENSSL
i = memcmp_s(tls_uid, uid_len, bs->data, uid_len, &diff);
#else
i = memcmp_s(tls_uid, uid_len, ASN1_STRING_get0_data(bs), uid_len, &diff);
#endif
if (i == EOK && !diff) {
EST_LOG_INFO("PoP is valid");
rv = EST_ERR_NONE;
Expand Down
67 changes: 41 additions & 26 deletions test/util/ossl_srv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,10 @@
#include <openssl/bio.h>
#include "apps.h" //taken from openssl/apps/apps.h

#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define ASN1_STRING_get0_data ASN1_STRING_data
#endif

extern BIO *bio_err;
BIO *cacerts = NULL;
static int msie_hack=0;
Expand Down Expand Up @@ -345,6 +349,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
BIO_printf(err,"no keyfile specified\n");
goto end;
}
#if OPENSSL_VERSION_NUMBER < 0x40000000L
if (format == FORMAT_ENGINE)
{
if (!e)
Expand All @@ -361,6 +366,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
}
goto end;
}
#endif
key=BIO_new(BIO_s_file());
if (key == NULL)
{
Expand Down Expand Up @@ -971,7 +977,7 @@ int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
if (!btmp)
return 0;

if (!BN_pseudo_rand(btmp, SERIAL_RAND_BITS, 0, 0))
if (!BN_rand(btmp, SERIAL_RAND_BITS, 0, 0))
goto error;
if (ai && !BN_to_ASN1_INTEGER(btmp, ai))
goto error;
Expand Down Expand Up @@ -1434,15 +1440,15 @@ static int do_updatedb (CA_DB *db)

/* get actual time and make a string */
a_tm = X509_gmtime_adj(a_tm, 0);
a_tm_s = (char *) OPENSSL_malloc(a_tm->length+1);
a_tm_s = (char *) OPENSSL_malloc(ASN1_STRING_length(a_tm)+1);
if (a_tm_s == NULL)
{
cnt = -1;
goto err;
}

memcpy(a_tm_s, a_tm->data, a_tm->length);
a_tm_s[a_tm->length] = '\0';
memcpy(a_tm_s, ASN1_STRING_get0_data(a_tm), ASN1_STRING_length(a_tm));
a_tm_s[ASN1_STRING_length(a_tm)] = '\0';

if (strncmp(a_tm_s, "49", 2) <= 0)
a_y2k = 1;
Expand Down Expand Up @@ -1508,19 +1514,19 @@ int old_entry_print(BIO *bp, ASN1_OBJECT *obj, ASN1_STRING *str)
*(pbuf++)='\0';
BIO_puts(bp,buf);

if (str->type == V_ASN1_PRINTABLESTRING)
if (ASN1_STRING_type(str) == V_ASN1_PRINTABLESTRING)
BIO_printf(bp,"PRINTABLE:'");
else if (str->type == V_ASN1_T61STRING)
else if (ASN1_STRING_type(str) == V_ASN1_T61STRING)
BIO_printf(bp,"T61STRING:'");
else if (str->type == V_ASN1_IA5STRING)
else if (ASN1_STRING_type(str) == V_ASN1_IA5STRING)
BIO_printf(bp,"IA5STRING:'");
else if (str->type == V_ASN1_UNIVERSALSTRING)
else if (ASN1_STRING_type(str) == V_ASN1_UNIVERSALSTRING)
BIO_printf(bp,"UNIVERSALSTRING:'");
else
BIO_printf(bp,"ASN.1 %2d:'",str->type);
p=(char *)str->data;
for (j=str->length; j>0; j--)
BIO_printf(bp,"ASN.1 %2d:'",ASN1_STRING_type(str));

p=(char *)ASN1_STRING_get0_data(str);
for (j=ASN1_STRING_length(str); j>0; j--)
{
if ((*p >= ' ') && (*p <= '~'))
BIO_printf(bp,"%c",*p);
Expand Down Expand Up @@ -1658,16 +1664,24 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
#else
nid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(ne));
#endif
if (str->type == V_ASN1_UNIVERSALSTRING)
if (ASN1_STRING_type(str) == V_ASN1_UNIVERSALSTRING)
ASN1_UNIVERSALSTRING_to_string(str);

if ((str->type == V_ASN1_IA5STRING) &&
if ((ASN1_STRING_type(str) == V_ASN1_IA5STRING) &&
(nid != NID_pkcs9_emailAddress))
str->type=V_ASN1_T61STRING;
{
X509_NAME_ENTRY_set_data(ne, V_ASN1_T61STRING,
ASN1_STRING_get0_data(str), ASN1_STRING_length(str));
str=X509_NAME_ENTRY_get_data(ne);
}

if ((nid == NID_pkcs9_emailAddress) &&
(str->type == V_ASN1_PRINTABLESTRING))
str->type=V_ASN1_IA5STRING;
(ASN1_STRING_type(str) == V_ASN1_PRINTABLESTRING))
{
X509_NAME_ENTRY_set_data(ne, V_ASN1_IA5STRING,
ASN1_STRING_get0_data(str), ASN1_STRING_length(str));
str=X509_NAME_ENTRY_get_data(ne);
}
}

/* If no EMAIL is wanted in the subject */
Expand All @@ -1676,18 +1690,18 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,

/* check some things */
if ((OBJ_obj2nid(obj) == NID_pkcs9_emailAddress) &&
(str->type != V_ASN1_IA5STRING))
(ASN1_STRING_type(str) != V_ASN1_IA5STRING))
{
BIO_printf(bio_err,"\nemailAddress type needs to be of type IA5STRING\n");
goto err;
}
if ((str->type != V_ASN1_BMPSTRING) && (str->type != V_ASN1_UTF8STRING))
if ((ASN1_STRING_type(str) != V_ASN1_BMPSTRING) && (ASN1_STRING_type(str) != V_ASN1_UTF8STRING))
{
j=ASN1_PRINTABLE_type(str->data,str->length);
j=ASN1_PRINTABLE_type(ASN1_STRING_get0_data(str),ASN1_STRING_length(str));
if ( ((j == V_ASN1_T61STRING) &&
(str->type != V_ASN1_T61STRING)) ||
(ASN1_STRING_type(str) != V_ASN1_T61STRING)) ||
((j == V_ASN1_IA5STRING) &&
(str->type == V_ASN1_PRINTABLESTRING)))
(ASN1_STRING_type(str) == V_ASN1_PRINTABLESTRING)))
{
BIO_printf(bio_err,"\nThe string contains characters that are illegal for the ASN.1 type\n");
goto err;
Expand Down Expand Up @@ -1791,7 +1805,8 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
}
if (j < 0)
{
BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,((str2 == NULL)?"NULL":(char *)str2->data),((str == NULL)?"NULL":(char *)str->data));
BIO_printf(bio_err,"The %s field needed to be the same in the\nCA certificate (%s) and the request (%s)\n",cv->name,
((str2 == NULL)?"NULL":(char *)ASN1_STRING_get0_data(str2)),((str == NULL)?"NULL":(char *)ASN1_STRING_get0_data(str)));
goto err;
}
}
Expand Down Expand Up @@ -2098,9 +2113,9 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509, const EVP_MD *dgst,
row[DB_type]=(char *)OPENSSL_malloc(2);

tm=X509_get_notAfter(ret);
row[DB_exp_date]=(char *)OPENSSL_malloc(tm->length+1);
memcpy(row[DB_exp_date],tm->data,tm->length);
row[DB_exp_date][tm->length]='\0';
row[DB_exp_date]=(char *)OPENSSL_malloc(ASN1_STRING_length(tm)+1);
memcpy(row[DB_exp_date],ASN1_STRING_get0_data(tm),ASN1_STRING_length(tm));
row[DB_exp_date][ASN1_STRING_length(tm)]='\0';

row[DB_rev_date]=NULL;

Expand Down