Skip to content
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.

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

feat(pkcs11-tool): print serial number when reading certificates #2641

Merged
merged 1 commit into from
Nov 14, 2022
Merged
Changes from all commits
Commits
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
feat(pkcs11-tool): print serial number when reading certificates
  • Loading branch information
AlexandreGonzalo committed Nov 14, 2022
commit 15f63a4b30d17d9bea81b5bfb3ebfd7cfbc17843
17 changes: 17 additions & 0 deletions src/tools/pkcs11-tool.c
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,7 @@ VARATTR_METHOD(OBJECT_ID, unsigned char); /* getOBJECT_ID */
VARATTR_METHOD(MODULUS, CK_BYTE); /* getMODULUS */
#ifdef ENABLE_OPENSSL
VARATTR_METHOD(SUBJECT, unsigned char); /* getSUBJECT */
VARATTR_METHOD(SERIAL_NUMBER, unsigned char); /* getSERIAL_NUMBER */
VARATTR_METHOD(PUBLIC_EXPONENT, CK_BYTE); /* getPUBLIC_EXPONENT */
#endif
VARATTR_METHOD(VALUE, unsigned char); /* getVALUE */
Expand Down Expand Up @@ -5177,6 +5178,7 @@ static void show_cert(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj)
char *label;
#if defined(ENABLE_OPENSSL)
unsigned char *subject;
unsigned char *serial_number;
#endif /* ENABLE_OPENSSL */

printf("Certificate Object; type = ");
Expand Down Expand Up @@ -5216,6 +5218,21 @@ static void show_cert(CK_SESSION_HANDLE sess, CK_OBJECT_HANDLE obj)
}
free(subject);
}
if ((serial_number = getSERIAL_NUMBER(sess, obj, &size)) != NULL) {
ASN1_INTEGER* serial = NULL;
const unsigned char *tmp = serial_number;
serial = d2i_ASN1_INTEGER(NULL, &tmp, size);
if (serial) {
BIO *bio = BIO_new(BIO_s_file());
BIO_set_fp(bio, stdout, BIO_NOCLOSE);
BIO_printf(bio, " serial: ");
i2a_ASN1_INTEGER(bio, serial);
BIO_printf(bio, "\n");
BIO_free(bio);
ASN1_INTEGER_free(serial);
}
free(serial_number);
}
#endif /* ENABLE_OPENSSL */

if ((id = getID(sess, obj, &size)) != NULL && size) {
Expand Down