Commit 65910c0
committed
tls: represent registeredID numerically always
Refs: 466e541
PR-URL: #41561
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 56679eb commit 65910c0
2 files changed
Lines changed: 6 additions & 7 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -773,11 +773,10 @@ static bool PrintGeneralName(const BIOPointer& out, const GENERAL_NAME* gen) { | |||
| 773 | 773 | #endif | |
| 774 | 774 | } | |
| 775 | 775 | } else if (gen->type == GEN_RID) { | |
| 776 | - // TODO(tniessen): unlike OpenSSL's default implementation, never print the | ||
| 777 | - // OID as text and instead always print its numeric representation, which is | ||
| 778 | - // backward compatible in practice and more future proof (see OBJ_obj2txt). | ||
| 776 | + // Unlike OpenSSL's default implementation, never print the OID as text and | ||
| 777 | + // instead always print its numeric representation. | ||
| 779 | 778 | char oline[256]; | |
| 780 | - i2t_ASN1_OBJECT(oline, sizeof(oline), gen->d.rid); | ||
| 779 | + OBJ_obj2txt(oline, sizeof(oline), gen->d.rid, true); | ||
| 781 | 780 | BIO_printf(out.get(), "Registered ID:%s", oline); | |
| 782 | 781 | } else if (gen->type == GEN_OTHERNAME) { | |
| 783 | 782 | // TODO(tniessen): the format that is used here is based on OpenSSL's | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -81,9 +81,9 @@ const { hasOpenSSL3 } = common; | |||
| 81 | 81 | hasOpenSSL3 ? | |
| 82 | 82 | 'DirName:"/C=DE/L=Berlin\\\\/CN=good.example.com"' : | |
| 83 | 83 | 'DirName:/C=DE/L=Berlin/CN=good.example.com', | |
| 84 | - // TODO(tniessen): even OIDs that are well-known (such as the following, | ||
| 85 | - // which is sha256WithRSAEncryption) should be represented numerically only. | ||
| 86 | - 'Registered ID:sha256WithRSAEncryption', | ||
| 84 | + // Even OIDs that are well-known (such as the following, which is | ||
| 85 | + // sha256WithRSAEncryption) should be represented numerically only. | ||
| 86 | + 'Registered ID:1.2.840.113549.1.1.11', | ||
| 87 | 87 | // This is an OID that will likely never be assigned to anything, thus | |
| 88 | 88 | // OpenSSL should not know it. | |
| 89 | 89 | 'Registered ID:1.3.9999.12.34', | |
0 commit comments