Skip to content

Commit acf6d3f

Browse files
authored
crmf: minor fixups (#850)
- Remove unused dependencies - Bump version back to 0.0.0 (crate is unpublished) - Fix links in README.md - Fix capitalization style for `PkiArchiveOptions` - Add CI configuration
1 parent a6f615a commit acf6d3f

File tree

6 files changed

+85
-23
lines changed

6 files changed

+85
-23
lines changed

.github/workflows/crmf.yml

+70
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
name: crmf
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- ".github/workflows/crmf.yml"
7+
- "const-oid/**"
8+
- "crmf/**"
9+
- "der/**"
10+
- "spki/**"
11+
- "x509-cert/**"
12+
- "Cargo.*"
13+
push:
14+
branches: master
15+
16+
defaults:
17+
run:
18+
working-directory: crmf
19+
20+
env:
21+
CARGO_INCREMENTAL: 0
22+
RUSTFLAGS: "-Dwarnings"
23+
24+
jobs:
25+
build:
26+
runs-on: ubuntu-latest
27+
strategy:
28+
matrix:
29+
rust:
30+
- 1.65.0 # MSRV
31+
- stable
32+
target:
33+
- thumbv7em-none-eabi
34+
- wasm32-unknown-unknown
35+
steps:
36+
- uses: actions/checkout@v3
37+
- uses: actions-rs/toolchain@v1
38+
with:
39+
profile: minimal
40+
toolchain: ${{ matrix.rust }}
41+
target: ${{ matrix.target }}
42+
override: true
43+
- uses: RustCrypto/actions/cargo-hack-install@master
44+
- run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features std,arbitrary
45+
46+
# FIXME: Temporary disabled until https://github.com/rust-fuzz/arbitrary/issues/136 is fixed
47+
# minimal-versions:
48+
# uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
49+
# with:
50+
# working-directory: ${{ github.workflow }}
51+
52+
test:
53+
runs-on: ubuntu-latest
54+
strategy:
55+
matrix:
56+
rust:
57+
- 1.65.0 # MSRV
58+
- stable
59+
steps:
60+
- uses: actions/checkout@v3
61+
62+
- uses: actions-rs/toolchain@v1
63+
with:
64+
profile: minimal
65+
toolchain: ${{ matrix.rust }}
66+
override: true
67+
- uses: RustCrypto/actions/cargo-hack-install@master
68+
- run: cargo hack test --feature-powerset
69+
70+

.github/workflows/x509-cert.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- uses: RustCrypto/actions/cargo-hack-install@master
4343
- run: cargo hack build --target ${{ matrix.target }} --feature-powerset --exclude-features std,arbitrary
4444

45-
# FIXME: Temporary disabled until https://github.com/rust-fuzz/arbitrary/issues/134 is fixed
45+
# FIXME: Temporary disabled until https://github.com/rust-fuzz/arbitrary/issues/136 is fixed
4646
# minimal-versions:
4747
# uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
4848
# with:

Cargo.lock

+1-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crmf/Cargo.toml

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
[package]
22
name = "crmf"
3-
version = "0.1.0"
3+
version = "0.0.0"
44
description = """
5-
Pure Rust implementation of the Certificate Request Message Format (CRMF) as described in RFC 4211
5+
Pure Rust implementation of the Certificate Request Message Format (CRMF) as
6+
described in RFC 4211
67
"""
78
authors = ["RustCrypto Developers"]
89
license = "Apache-2.0 OR MIT"
@@ -14,15 +15,9 @@ edition = "2021"
1415
rust-version = "1.65"
1516

1617
[dependencies]
17-
der = { version = "0.7.0-pre", features = ["oid", "derive", "alloc"], path = "../der" }
18-
x509-cert = { version = "0.2.0-pre", path = "../x509-cert" }
19-
const-oid = { version = "0.10.0-pre", path = "../const-oid" }
20-
spki = { version = "0.7.0-pre", path = "../spki" }
21-
# cms = { version = "0.1.0", path = "../cms" }
22-
flagset = { version = "0.4.3" }
23-
24-
[dev-dependencies]
25-
hex-literal = "0.3"
18+
der = { version = "=0.7.0-pre", features = ["alloc", "derive"], path = "../der" }
19+
x509-cert = { version = "=0.2.0-pre", path = "../x509-cert" }
20+
spki = { version = "=0.7.0-pre", path = "../spki" }
2621

2722
[features]
2823
alloc = ["der/alloc"]

crmf/README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ dual licensed as above, without any additional terms or conditions.
4242

4343
[//]: # (badges)
4444

45-
[crate-image]: https://img.shields.io/crates/v/x509.svg
46-
[crate-link]: https://crates.io/crates/x509
47-
[docs-image]: https://docs.rs/x509/badge.svg
48-
[docs-link]: https://docs.rs/x509/
49-
[build-image]: https://github.com/RustCrypto/formats/actions/workflows/x509.yml/badge.svg
50-
[build-link]: https://github.com/RustCrypto/formats/actions/workflows/x509.yml
45+
[crate-image]: https://img.shields.io/crates/v/crmf.svg
46+
[crate-link]: https://crates.io/crates/crmf
47+
[docs-image]: https://docs.rs/crmf/badge.svg
48+
[docs-link]: https://docs.rs/crmf/
49+
[build-image]: https://github.com/RustCrypto/formats/actions/workflows/crmf.yml/badge.svg
50+
[build-link]: https://github.com/RustCrypto/formats/actions/workflows/crmf.yml
5151
[license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
5252
[rustc-image]: https://img.shields.io/badge/rustc-1.57+-blue.svg
5353
[chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg

crmf/src/controls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub enum SinglePubInfoMethod {
125125
#[derive(Clone, Debug, PartialEq, Eq, Choice)]
126126
#[allow(clippy::large_enum_variant)]
127127
#[allow(missing_docs)]
128-
pub enum PKIArchiveOptions {
128+
pub enum PkiArchiveOptions {
129129
#[asn1(context_specific = "0", tag_mode = "EXPLICIT", constructed = "true")]
130130
EncryptedPrivKey(EncryptedKey),
131131
#[asn1(context_specific = "0", tag_mode = "EXPLICIT", constructed = "true")]

0 commit comments

Comments
 (0)