Skip to content

Add TLS-Certificate.Serial-Number-And-Issuer #5728

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
minfrin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add TLS-Certificate.Serial-Number-And-Issuer #5728

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
1 change: 1 addition & 0 deletions src/lib/tls/attrs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_serial;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_signature;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_signature_algorithm;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_issuer;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_serial_number_and_issuer;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_not_before;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_not_after;
extern HIDDEN fr_dict_attr_t const *attr_tls_certificate_subject;
Expand Down
2 changes: 2 additions & 0 deletions src/lib/tls/base.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ fr_dict_attr_t const *attr_tls_certificate_serial;
fr_dict_attr_t const *attr_tls_certificate_signature;
fr_dict_attr_t const *attr_tls_certificate_signature_algorithm;
fr_dict_attr_t const *attr_tls_certificate_issuer;
fr_dict_attr_t const *attr_tls_certificate_serial_number_and_issuer;
fr_dict_attr_t const *attr_tls_certificate_not_before;
fr_dict_attr_t const *attr_tls_certificate_not_after;
fr_dict_attr_t const *attr_tls_certificate_subject;
Expand Down Expand Up @@ -156,6 +157,7 @@ fr_dict_attr_autoload_t tls_dict_attr[] = {
{ .out = &attr_tls_certificate_signature, .name = "TLS-Certificate.Signature", .type = FR_TYPE_OCTETS, .dict = &dict_freeradius },
{ .out = &attr_tls_certificate_signature_algorithm, .name = "TLS-Certificate.Signature-Algorithm", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
{ .out = &attr_tls_certificate_issuer, .name = "TLS-Certificate.Issuer", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
{ .out = &attr_tls_certificate_serial_number_and_issuer, .name = "TLS-Certificate.Serial-Number-And-Issuer", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
{ .out = &attr_tls_certificate_not_before, .name = "TLS-Certificate.Not-Before", .type = FR_TYPE_DATE, .dict = &dict_freeradius },
{ .out = &attr_tls_certificate_not_after, .name = "TLS-Certificate.Not-After", .type = FR_TYPE_DATE, .dict = &dict_freeradius },
{ .out = &attr_tls_certificate_subject, .name = "TLS-Certificate.Subject", .type = FR_TYPE_STRING, .dict = &dict_freeradius },
Expand Down
43 changes: 42 additions & 1 deletion src/lib/tls/pairs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,8 @@ int fr_tls_session_pairs_from_x509_cert(fr_pair_list_t *pair_list, TALLOC_CTX *c
int loc;
char buff[1024];

ASN1_INTEGER const *serial = NULL;

ASN1_TIME const *asn_time;
time_t time;

Expand Down Expand Up @@ -287,7 +289,6 @@ int fr_tls_session_pairs_from_x509_cert(fr_pair_list_t *pair_list, TALLOC_CTX *c
* Serial number
*/
{
ASN1_INTEGER const *serial = NULL;
unsigned char *der;
int len;

Expand All @@ -303,6 +304,46 @@ int fr_tls_session_pairs_from_x509_cert(fr_pair_list_t *pair_list, TALLOC_CTX *c
i2d_ASN1_INTEGER(serial, &der);
}

/*
* Serial Number and Issuer
*/
{
BIO *bio;
char *decimal;
BIGNUM *bn;

bio = fr_tls_bio_dbuff_thread_local(vp, 256, 0);

BIO_puts("{ serialNumber ");

if (unlikely(!(bn = ASN1_INTEGER_to_BN(serial, NULL)))) {
fr_tls_bio_dbuff_thread_local_clear();
fr_tls_log(request, "Failed converting certificate serial to big number");
}
if (unlikely(!(decimal = BN_bn2dec(bn)))) {
BN_free(bn);
fr_tls_bio_dbuff_thread_local_clear();
fr_tls_log(request, "Failed converting certificate serial to decimal");
goto error;
}
BN_free(bn);
BIO_puts(decimal);
OPENSSL_free(decimal);

BIO_puts(", issuer rdnSequence:\"");

if (unlikely(X509_NAME_print_ex(bio, X509_get_issuer_name(cert), 0, XN_FLAG_RFC2253) < 0)) {
fr_tls_bio_dbuff_thread_local_clear();
fr_tls_log(request, "Failed retrieving certificate issuer");
goto error;
}

BIO_puts("\" }");

MEM(fr_pair_append_by_da(ctx, &vp, pair_list, attr_tls_certificate_serial_number_and_issuer) == 0);
fr_pair_value_bstrdup_buffer_shallow(vp, fr_tls_bio_dbuff_thread_local_finalise_bstr(), true);
}

/*
* Not valid before
*/
Expand Down
⚡