forked from openssl/openssl
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support the attributeDescriptor X.509v3 extension
Reviewed-by: Neil Horman <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from openssl#25429)
- Loading branch information
1 parent
ba6f115
commit cccdf41
Showing
5 changed files
with
233 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,191 @@ | ||
| /* | ||
| * Copyright 2024 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 | ||
| * in the file LICENSE in the source distribution or at | ||
| * https://www.openssl.org/source/license.html | ||
| */ | ||
|
|
||
| #include <openssl/asn1t.h> | ||
| #include <openssl/x509v3.h> | ||
| #include <crypto/x509.h> | ||
| #include "ext_dat.h" | ||
|
|
||
| ASN1_SEQUENCE(OSSL_HASH) = { | ||
| ASN1_SIMPLE(OSSL_HASH, algorithmIdentifier, X509_ALGOR), | ||
| ASN1_OPT(OSSL_HASH, hashValue, ASN1_BIT_STRING), | ||
| } ASN1_SEQUENCE_END(OSSL_HASH) | ||
|
|
||
| ASN1_SEQUENCE(OSSL_INFO_SYNTAX_POINTER) = { | ||
| ASN1_SIMPLE(OSSL_INFO_SYNTAX_POINTER, name, GENERAL_NAMES), | ||
| ASN1_OPT(OSSL_INFO_SYNTAX_POINTER, hash, OSSL_HASH), | ||
| } ASN1_SEQUENCE_END(OSSL_INFO_SYNTAX_POINTER) | ||
|
|
||
| ASN1_CHOICE(OSSL_INFO_SYNTAX) = { | ||
| ASN1_SIMPLE(OSSL_INFO_SYNTAX, choice.content, DIRECTORYSTRING), | ||
| ASN1_SIMPLE(OSSL_INFO_SYNTAX, choice.pointer, OSSL_INFO_SYNTAX_POINTER) | ||
| } ASN1_CHOICE_END(OSSL_INFO_SYNTAX) | ||
|
|
||
| ASN1_SEQUENCE(OSSL_PRIVILEGE_POLICY_ID) = { | ||
| ASN1_SIMPLE(OSSL_PRIVILEGE_POLICY_ID, privilegePolicy, ASN1_OBJECT), | ||
| ASN1_SIMPLE(OSSL_PRIVILEGE_POLICY_ID, privPolSyntax, OSSL_INFO_SYNTAX), | ||
| } ASN1_SEQUENCE_END(OSSL_PRIVILEGE_POLICY_ID) | ||
|
|
||
| ASN1_SEQUENCE(OSSL_ATTRIBUTE_DESCRIPTOR) = { | ||
| ASN1_SIMPLE(OSSL_ATTRIBUTE_DESCRIPTOR, identifier, ASN1_OBJECT), | ||
| ASN1_SIMPLE(OSSL_ATTRIBUTE_DESCRIPTOR, attributeSyntax, ASN1_OCTET_STRING), | ||
| ASN1_IMP_OPT(OSSL_ATTRIBUTE_DESCRIPTOR, name, ASN1_UTF8STRING, 0), | ||
| ASN1_IMP_OPT(OSSL_ATTRIBUTE_DESCRIPTOR, description, ASN1_UTF8STRING, 1), | ||
| ASN1_SIMPLE(OSSL_ATTRIBUTE_DESCRIPTOR, dominationRule, OSSL_PRIVILEGE_POLICY_ID), | ||
| } ASN1_SEQUENCE_END(OSSL_ATTRIBUTE_DESCRIPTOR) | ||
|
|
||
| IMPLEMENT_ASN1_FUNCTIONS(OSSL_HASH) | ||
| IMPLEMENT_ASN1_FUNCTIONS(OSSL_INFO_SYNTAX) | ||
| IMPLEMENT_ASN1_FUNCTIONS(OSSL_INFO_SYNTAX_POINTER) | ||
| IMPLEMENT_ASN1_FUNCTIONS(OSSL_PRIVILEGE_POLICY_ID) | ||
| IMPLEMENT_ASN1_FUNCTIONS(OSSL_ATTRIBUTE_DESCRIPTOR) | ||
|
|
||
| /* Copied from x_attrib.c */ | ||
| static int print_hex(BIO *out, unsigned char *buf, int len) | ||
| { | ||
| int result = 1; | ||
| char *hexbuf; | ||
|
|
||
| if (len == 0) | ||
| return 1; | ||
|
|
||
| hexbuf = OPENSSL_buf2hexstr(buf, len); | ||
| if (hexbuf == NULL) | ||
| return 0; | ||
| result = BIO_puts(out, hexbuf) > 0; | ||
|
|
||
| OPENSSL_free(hexbuf); | ||
| return result; | ||
| } | ||
|
|
||
| static int i2r_HASH(X509V3_EXT_METHOD *method, | ||
| OSSL_HASH *hash, | ||
| BIO *out, int indent) | ||
| { | ||
| if (BIO_printf(out, "%*sAlgorithm: ", indent, "") <= 0) | ||
| return 0; | ||
| if (i2a_ASN1_OBJECT(out, hash->algorithmIdentifier->algorithm) <= 0) | ||
| return 0; | ||
| if (BIO_puts(out, "\n") <= 0) | ||
| return 0; | ||
| if (hash->algorithmIdentifier->parameter) { | ||
| if (BIO_printf(out, "%*sParameter: ", indent, "") <= 0) | ||
| return 0; | ||
| if (ossl_print_attribute_value(out, 0, hash->algorithmIdentifier->parameter, | ||
| indent + 4) <= 0) | ||
| return 0; | ||
| if (BIO_puts(out, "\n") <= 0) | ||
| return 0; | ||
| } | ||
| if (BIO_printf(out, "%*sHash Value: ", indent, "") <= 0) | ||
| return 0; | ||
| return print_hex(out, hash->hashValue->data, hash->hashValue->length); | ||
| } | ||
|
|
||
| static int i2r_INFO_SYNTAX_POINTER(X509V3_EXT_METHOD *method, | ||
| OSSL_INFO_SYNTAX_POINTER *pointer, | ||
| BIO *out, int indent) | ||
| { | ||
| if (BIO_printf(out, "%*sNames:\n", indent, "") <= 0) | ||
| return 0; | ||
| if (OSSL_GENERAL_NAMES_print(out, pointer->name, indent) <= 0) | ||
| return 0; | ||
| if (BIO_puts(out, "\n") <= 0) | ||
| return 0; | ||
| if (pointer->hash != NULL) { | ||
| if (BIO_printf(out, "%*sHash:\n", indent, "") <= 0) | ||
| return 0; | ||
| if (i2r_HASH(method, pointer->hash, out, indent + 4) <= 0) | ||
| return 0; | ||
| } | ||
| return 1; | ||
| } | ||
|
|
||
| static int i2r_OSSL_INFO_SYNTAX(X509V3_EXT_METHOD *method, | ||
| OSSL_INFO_SYNTAX *info, | ||
| BIO *out, int indent) | ||
| { | ||
| switch (info->type) { | ||
| case (OSSL_INFO_SYNTAX_TYPE_CONTENT): | ||
| if (BIO_printf(out, "%*sContent: ", indent, "") <= 0) | ||
| return 0; | ||
| if (BIO_printf(out, "%.*s", info->choice.content->length, info->choice.content->data) <= 0) | ||
| return 0; | ||
| if (BIO_puts(out, "\n") <= 0) | ||
| return 0; | ||
| return 1; | ||
| case (OSSL_INFO_SYNTAX_TYPE_POINTER): | ||
| if (BIO_printf(out, "%*sPointer:\n", indent, "") <= 0) | ||
| return 0; | ||
| return i2r_INFO_SYNTAX_POINTER(method, info->choice.pointer, out, indent + 4); | ||
| default: | ||
| return 0; | ||
| } | ||
| return 0; | ||
| } | ||
|
|
||
| static int i2r_OSSL_PRIVILEGE_POLICY_ID(X509V3_EXT_METHOD *method, | ||
| OSSL_PRIVILEGE_POLICY_ID *ppid, | ||
| BIO *out, int indent) | ||
| { | ||
| char buf[80]; | ||
|
|
||
| /* Intentionally display the numeric OID, rather than the textual name. */ | ||
| if (OBJ_obj2txt(buf, sizeof(buf), ppid->privilegePolicy, 1) <= 0) | ||
| return 0; | ||
| if (BIO_printf(out, "%*sPrivilege Policy Identifier: %s\n", indent, "", buf) <= 0) | ||
| return 0; | ||
| if (BIO_printf(out, "%*sPrivilege Policy Syntax:\n", indent, "") <= 0) | ||
| return 0; | ||
| return i2r_OSSL_INFO_SYNTAX(method, ppid->privPolSyntax, out, indent + 4); | ||
| } | ||
|
|
||
| static int i2r_OSSL_ATTRIBUTE_DESCRIPTOR(X509V3_EXT_METHOD *method, | ||
| OSSL_ATTRIBUTE_DESCRIPTOR *ad, | ||
| BIO *out, int indent) | ||
| { | ||
| char buf[80]; | ||
|
|
||
| /* Intentionally display the numeric OID, rather than the textual name. */ | ||
| if (OBJ_obj2txt(buf, sizeof(buf), ad->identifier, 1) <= 0) | ||
| return 0; | ||
| if (BIO_printf(out, "%*sIdentifier: %s\n", indent, "", buf) <= 0) | ||
| return 0; | ||
| if (BIO_printf(out, "%*sSyntax:\n", indent, "") <= 0) | ||
| return 0; | ||
| if (BIO_printf(out, "%*s%.*s", indent + 4, "", | ||
| ad->attributeSyntax->length, ad->attributeSyntax->data) <= 0) | ||
| return 0; | ||
| if (BIO_puts(out, "\n\n") <= 0) | ||
| return 0; | ||
| if (ad->name != NULL) { | ||
| if (BIO_printf(out, "%*sName: %.*s\n", indent, "", ad->name->length, ad->name->data) <= 0) | ||
| return 0; | ||
| } | ||
| if (ad->description != NULL) { | ||
| if (BIO_printf(out, "%*sDescription: %.*s\n", indent, "", | ||
| ad->description->length, ad->description->data) <= 0) | ||
| return 0; | ||
| } | ||
| if (BIO_printf(out, "%*sDomination Rule:\n", indent, "") <= 0) | ||
| return 0; | ||
| return i2r_OSSL_PRIVILEGE_POLICY_ID(method, ad->dominationRule, out, indent + 4); | ||
| } | ||
|
|
||
| const X509V3_EXT_METHOD ossl_v3_attribute_descriptor = { | ||
| NID_attribute_descriptor, X509V3_EXT_MULTILINE, | ||
| ASN1_ITEM_ref(OSSL_ATTRIBUTE_DESCRIPTOR), | ||
| 0, 0, 0, 0, | ||
| 0, 0, | ||
| 0, | ||
| 0, | ||
| (X509V3_EXT_I2R)i2r_OSSL_ATTRIBUTE_DESCRIPTOR, | ||
| NULL, | ||
| NULL | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters