Skip to content

Add support for Platform Certificates attributes #27

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

Merged
JonathanWilbur merged 2 commits into from
Feb 2, 2023
Merged

Add support for Platform Certificates attributes #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92d4890
Minimally print platform certificate information
JonathanWilbur Jan 25, 2023
9e209f4
Encode and decode platform certs
JonathanWilbur Feb 1, 2023
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
4 changes: 4 additions & 0 deletions crypto/asn1/asn1_item_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = {
ASN1_ITEM_ref(CMS_EnvelopedData),
ASN1_ITEM_ref(CMS_ReceiptRequest),
#endif
ASN1_ITEM_ref(COMMON_CRITERIA_MEASURES),
ASN1_ITEM_ref(CRL_DIST_POINTS),
#ifndef OPENSSL_NO_DH
ASN1_ITEM_ref(DHparams),
Expand All @@ -71,6 +72,7 @@ static ASN1_ITEM_EXP *asn1_item_list[] = {
#endif
ASN1_ITEM_ref(EDIPARTYNAME),
ASN1_ITEM_ref(EXTENDED_KEY_USAGE),
ASN1_ITEM_ref(FIPS_LEVEL),
ASN1_ITEM_ref(GENERAL_NAMES),
ASN1_ITEM_ref(GENERAL_NAME),
ASN1_ITEM_ref(GENERAL_SUBTREE),
Expand Down Expand Up @@ -150,6 +152,8 @@ static ASN1_ITEM_EXP *asn1_item_list[] = {
ASN1_ITEM_ref(SXNETID),
ASN1_ITEM_ref(SXNET),
ASN1_ITEM_ref(TARGETING_INFORMATION),
ASN1_ITEM_ref(TBB_SECURITY_ASSERTIONS),
ASN1_ITEM_ref(URI_REFERENCE),
ASN1_ITEM_ref(USERNOTICE),
ASN1_ITEM_ref(USER_NOTICE_SYNTAX),
ASN1_ITEM_ref(X509_ACERT),
Expand Down
13 changes: 13 additions & 0 deletions crypto/objects/obj_dat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,3 +794,16 @@ int OBJ_obj2nid(const ASN1_OBJECT *a)
{
return ossl_obj_obj2nid(a, 1);
}

int print_oid (BIO *out, ASN1_OBJECT *oid) {
const char *ln;
char objbuf[80];

if (OBJ_obj2txt(objbuf, sizeof(objbuf), oid, 1) <= 0) {
return 0;
}
ln = OBJ_nid2ln(OBJ_obj2nid(oid));
return (ln != NULL)
? BIO_printf(out, "%s (%s)", objbuf, ln)
: BIO_printf(out, "%s", objbuf);
}
287 changes: 281 additions & 6 deletions crypto/objects/obj_dat.h
View file
Open in desktop

Large diffs are not rendered by default.

55 changes: 55 additions & 0 deletions crypto/objects/obj_mac.num
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,3 +1312,58 @@ alt_signature_algorithm 1311
alt_signature_value 1312
associated_information 1313
id_aa_issuing_distribution_point 1314
tcg 1315
tcg_tcpaSpecVersion 1316
tcg_attribute 1317
tcg_protocol 1318
tcg_algorithm 1319
tcg_platformClass 1320
tcg_ce 1321
tcg_kp 1322
tcg_address 1323
tcg_registry 1324
tcg_common 1325
tcg_at_platformManufacturerStr 1326
tcg_at_platformManufacturerId 1327
tcg_at_platformConfigUri 1328
tcg_at_platformModel 1329
tcg_at_platformVersion 1330
tcg_at_platformSerial 1331
tcg_at_platformConfiguration 1332
tcg_at_tpmManufacturer 1333
tcg_at_tpmModel 1334
tcg_at_tpmVersion 1335
tcg_at_securityQualities 1336
tcg_at_tpmProtectionProfile 1337
tcg_at_tpmSecurityTarget 1338
tcg_at_tbbProtectionProfile 1339
tcg_at_tbbSecurityTarget 1340
tcg_at_tpmIdLabel 1341
tcg_at_tpmSpecification 1342
tcg_at_tcgPlatformSpecification 1343
tcg_at_tpmSecurityAssertions 1344
tcg_at_tbbSecurityAssertions 1345
tcg_at_tcgCredentialSpecification 1346
tcg_at_tcgCredentialType 1347
tcg_at_platformConfiguration_v1 1348
tcg_at_platformConfiguration_v2 1349
tcg_algorithm_null 1350
tcg_kp_EKCertificate 1351
tcg_kp_PlatformAttributeCertificate 1352
tcg_kp_AIKCertificate 1353
tcg_kp_PlatformKeyCertificate 1354
tcg_kp_DeltaPlatformAttributeCertificate 1355
tcg_ce_relevantCredentials 1356
tcg_ce_relevantManifests 1357
tcg_ce_virtualPlatformAttestationService 1358
tcg_ce_migrationControllerAttestationService 1359
tcg_ce_migrationControllerRegistrationService 1360
tcg_ce_virtualPlatformBackupService 1361
tcg_prt_tpmIdProtocol 1362
tcg_address_ethernetmac 1363
tcg_address_wlanmac 1364
tcg_address_bluetoothmac 1365
tcg_registry_componentClass 1366
tcg_registry_componentClass_tcg 1367
tcg_registry_componentClass_ietf 1368
tcg_registry_componentClass_dmtf 1369
2 changes: 1 addition & 1 deletion crypto/objects/obj_xref.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* WARNING: do not edit!
* Generated by objxref.pl
*
* Copyright 1998-2022 The OpenSSL Project Authors. All Rights Reserved.
* Copyright 1998-2023 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
Expand Down
67 changes: 67 additions & 0 deletions crypto/objects/objects.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1856,3 +1856,70 @@ oracle 746875 1 1 : oracle-jdk-trustedkeyusage : Trusted key usage (Oracle)
# NID for compression
: brotli : Brotli compression
: zstd : Zstandard compression

2 23 133 : tcg : Trusted Computing Group

tcg 1 : tcg-tcpaSpecVersion
tcg 2 : tcg-attribute : Trusted Computing Group Attributes
tcg 3 : tcg-protocol : Trusted Computing Group Protocols
tcg 4 : tcg-algorithm : Trusted Computing Group Algorithms
tcg 5 : tcg-platformClass : Trusted Computing Group Platform Classes
tcg 6 : tcg-ce : Trusted Computing Group Certificate Extensions
tcg 8 : tcg-kp : Trusted Computing Group Key Purposes
tcg 17 : tcg-address : Trusted Computing Group Address Formats
tcg 18 : tcg-registry : Trusted Computing Group Registry

tcg-platformClass 1 : tcg-common : TCG Common
tcg-common 1 : tcg-at-platformManufacturerStr : TCG Platform Manufacturer String
tcg-common 2 : tcg-at-platformManufacturerId : TCG Platform Manufacturer ID
tcg-common 3 : tcg-at-platformConfigUri : TCG Platform Configuration URI
tcg-common 4 : tcg-at-platformModel : TCG Platform Model
tcg-common 5 : tcg-at-platformVersion : TCG Platform Version
tcg-common 6 : tcg-at-platformSerial : TCG Platform Serial Number
tcg-common 7 : tcg-at-platformConfiguration : TCG Platform Configuration

tcg-attribute 1 : tcg-at-tpmManufacturer : TPM Manufacturer
tcg-attribute 2 : tcg-at-tpmModel : TPM Model
tcg-attribute 3 : tcg-at-tpmVersion : TPM Version
tcg-attribute 10 : tcg-at-securityQualities : Security Qualities
tcg-attribute 11 : tcg-at-tpmProtectionProfile : TPM Protection Profile
tcg-attribute 12 : tcg-at-tpmSecurityTarget : TPM Security Target
tcg-attribute 13 : tcg-at-tbbProtectionProfile : TBB Protection Profile
tcg-attribute 14 : tcg-at-tbbSecurityTarget : TBB Security Target
tcg-attribute 15 : tcg-at-tpmIdLabel : TPM ID Label
tcg-attribute 16 : tcg-at-tpmSpecification : TPM Specification
tcg-attribute 17 : tcg-at-tcgPlatformSpecification : TPM Platform Specification
tcg-attribute 18 : tcg-at-tpmSecurityAssertions : TPM Security Assertions
tcg-attribute 19 : tcg-at-tbbSecurityAssertions : TBB Security Assertions
tcg-attribute 23 : tcg-at-tcgCredentialSpecification : TCG Credential Specification
tcg-attribute 25 : tcg-at-tcgCredentialType : TCG Credential Type

tcg-at-platformConfiguration 1 : tcg-at-platformConfiguration-v1 : Platform Configuration Version 1
tcg-at-platformConfiguration 2 : tcg-at-platformConfiguration-v2 : Platform Configuration Version 2

tcg-algorithm 1 : tcg-algorithm-null : TCG NULL Algorithm

tcg-kp 1 : tcg-kp-EKCertificate : Endorsement Key Certificate
tcg-kp 2 : tcg-kp-PlatformAttributeCertificate : Platform Attribute Certificate
tcg-kp 3 : tcg-kp-AIKCertificate : Attestation Identity Key Certificate
tcg-kp 4 : tcg-kp-PlatformKeyCertificate : Platform Key Certificate
tcg-kp 5 : tcg-kp-DeltaPlatformAttributeCertificate : Delta Platform Attribute Certificate

tcg-ce 2 : tcg-ce-relevantCredentials : Relevant Credentials
tcg-ce 3 : tcg-ce-relevantManifests : Relevant Manifests
tcg-ce 4 : tcg-ce-virtualPlatformAttestationService : Virtual Platform Attestation Service
tcg-ce 5 : tcg-ce-migrationControllerAttestationService : Migration Controller Attestation Service
tcg-ce 6 : tcg-ce-migrationControllerRegistrationService : Migration Controller Registration Service
tcg-ce 7 : tcg-ce-virtualPlatformBackupService : Virtual Platform Backup Service

tcg-protocol 1 : tcg-prt-tpmIdProtocol : TCG TPM Protocol

tcg-address 1 : tcg-address-ethernetmac : Ethernet MAC Address
tcg-address 2 : tcg-address-wlanmac : WLAN MAC Address
tcg-address 3 : tcg-address-bluetoothmac : Bluetooth MAC Address

tcg-registry 3 : tcg-registry-componentClass : TCG Component Class

tcg-registry-componentClass 1 : tcg-registry-componentClass-tcg : Trusted Computed Group Registry
tcg-registry-componentClass 2 : tcg-registry-componentClass-ietf : Internet Engineering Task Force Registry
tcg-registry-componentClass 3 : tcg-registry-componentClass-dmtf : Distributed Management Task Force Registry
2 changes: 1 addition & 1 deletion crypto/x509/build.info
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ SOURCE[../../libcrypto]=\
v3_single_use.c v3_ac_tgt.c v3_audit_id.c v3_bacons.c v3_sda.c \
v3_usernotice.c x_unotice.c x_iserial.c v3_authattid.c v3_iobo.c \
v3_aaa.c v3_attrmap.c v3_ind_iss.c v3_attrdesc.c v3_rolespec.c \
v3_timespec.c
v3_timespec.c platcert.c

IF[{- !$disabled{'deprecated-3.0'} -}]
SOURCE[../../libcrypto]=x509type.c
Expand Down
Loading