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.

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

x509-cert: use SCT OIDs from const-oid #1288

Merged
merged 2 commits into from
Dec 26, 2023
Merged

x509-cert: use SCT OIDs from const-oid #1288

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
09d9ca7
const-oid: update changelog
robjtede Dec 26, 2023
3c67869
x509-cert: use SCT OIDs from const-oid
robjtede Dec 26, 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
24 changes: 12 additions & 12 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions const-oid/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.9.6 (2023-12-15)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh. right. I completely forgot to put those back in the master branch.

Thanks!

### Added
- RFC6962 (Certificate Transparency) OIDs ([#1134])

[#1134]: https://github.com/RustCrypto/formats/pull/1134

## 0.9.5 (2023-08-02)
### Added
- RFC8410 (curve25519) OIDs ([#867])
Expand Down
2 changes: 1 addition & 1 deletion x509-cert/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ edition = "2021"
rust-version = "1.65"

[dependencies]
const-oid = { version = "0.9.3", features = ["db"] }
const-oid = { version = "0.9.6", features = ["db"] }
der = { version = "0.7.6", features = ["alloc", "derive", "flagset", "oid"] }
spki = { version = "0.7.3", features = ["alloc"] }

Expand Down
6 changes: 1 addition & 5 deletions x509-cert/src/ext/pkix/sct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#![cfg(feature = "sct")]

use alloc::{format, vec::Vec};
use const_oid::{AssociatedOid, ObjectIdentifier};
use const_oid::{db::rfc6962::CT_PRECERT_SCTS, AssociatedOid, ObjectIdentifier};
use der::asn1::OctetString;
use tls_codec::{
DeserializeBytes, SerializeBytes, TlsByteVecU16, TlsDeserializeBytes, TlsSerializeBytes,
Expand All @@ -23,10 +23,6 @@ use tls_codec::{
#[derive(Debug, PartialEq)]
pub struct SignedCertificateTimestampList(OctetString);

//TODO: Remove this and use const-oid's rfc6962::CT_PRECERT_SCTS once a const-oid version
// containing it is published
const CT_PRECERT_SCTS: ObjectIdentifier = ObjectIdentifier::new_unwrap("1.3.6.1.4.1.11129.2.4.2");

impl AssociatedOid for SignedCertificateTimestampList {
const OID: ObjectIdentifier = CT_PRECERT_SCTS;
}
Expand Down