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

Jump to bottom

pkcs12: initial types with decoders/encoders #1165

Merged
merged 31 commits into from
Sep 8, 2023
Merged

pkcs12: initial types with decoders/encoders #1165

merged 31 commits into from
Sep 8, 2023

Commits on Jul 18, 2023

  1. initial pkcs12 encoder/decoder

    @carl-wallace
    carl-wallace committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    ce1e1fc View commit details
    Browse the repository at this point in the history

  2. add a few more OIDs from ASN.1 module in RFC7292

    @carl-wallace
    carl-wallace committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    028019f View commit details
    Browse the repository at this point in the history

  3. added tests

    @carl-wallace
    carl-wallace committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    3c89436 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2023

  1. add higher level function to get key and cert from a PKCS12 object

    @carl-wallace
    carl-wallace committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    2beff94 View commit details
    Browse the repository at this point in the history

  2. add missing dev-dependencies

    @carl-wallace
    carl-wallace committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    842c725 View commit details
    Browse the repository at this point in the history

  3. rename utils.rs to decrypt.rs

    @carl-wallace
    carl-wallace committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    cd586b1 View commit details
    Browse the repository at this point in the history

  4. add a few more test cases

    @carl-wallace
    carl-wallace committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    fc5ca02 View commit details
    Browse the repository at this point in the history

  5. remove file added in error

    @carl-wallace
    carl-wallace committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    2db1587 View commit details
    Browse the repository at this point in the history

  6. temporarily copied over kdf.rs from RustCrypto#1154 and refactored de… 

    …crypt support to use it. added a test case with a pfx from PKITS to exercise the kdf. added implementation of EncryptedPrivateKeyInfo.
    @carl-wallace
    carl-wallace committed Jul 19, 2023
    Configuration menu
    Copy the full SHA
    2dbc115 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2023

  1. fix bug with default number of iterations. add test that uses default… 

    … number of iterations. add a todo list.
    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    45fa045 View commit details
    Browse the repository at this point in the history

  2. support multiple cert bags

    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    2d37940 View commit details
    Browse the repository at this point in the history

  3. add test with p12 exported from macos (fails due to rc2 usage)

    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    ee73142 View commit details
    Browse the repository at this point in the history

  4. add windows test cases, fix bug where iterations from params was not … 

    …used, fmt, clippy
    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    3e08a57 View commit details
    Browse the repository at this point in the history

  5. add mac verification

    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    17ce9d4 View commit details
    Browse the repository at this point in the history

  6. split decrypt tests to separate file

    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    63dead4 View commit details
    Browse the repository at this point in the history

  7. added additional mac verification algorithms. added more test cases g… 

    …enerated using openssl.
    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    e4d980b View commit details
    Browse the repository at this point in the history

  8. add a couple of todos. update Cargo.lock (missed last commit)

    @carl-wallace
    carl-wallace committed Jul 20, 2023
    Configuration menu
    Copy the full SHA
    ceba8f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2023

  1. minor edits to Error type

    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6920df8 View commit details
    Browse the repository at this point in the history

  2. remove file

    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    67a0198 View commit details
    Browse the repository at this point in the history

  3. basic builder structure

    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    fe3a799 View commit details
    Browse the repository at this point in the history

  4. incremental progress on builder. can emit a pfx containing plaintext … 

    …key and cert with no mac that openssl can parse
    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    6920508 View commit details
    Browse the repository at this point in the history

  5. remove spurious map_err

    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    49e4224 View commit details
    Browse the repository at this point in the history

  6. incremental progress on builder. can now emit shrouded key bag that o… 

    …penssl can process.
    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    0da354a View commit details
    Browse the repository at this point in the history

  7. added support for encrypted cert bags and inclusion of a mac

    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    f155700 View commit details
    Browse the repository at this point in the history

  8. minor cleanup, some feature hygiene, added mac_data presence check to… 

    … a few tests
    @carl-wallace
    carl-wallace committed Jul 21, 2023
    Configuration menu
    Copy the full SHA
    73528fc View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2023

  1. Merge branch 'master' into pkcs12

    @carl-wallace
    carl-wallace committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    cc3fcbd View commit details
    Browse the repository at this point in the history

  2. pare down to encoder/decoder only

    @carl-wallace
    carl-wallace committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    51eb92e View commit details
    Browse the repository at this point in the history

  3. remove some bits from cargo.toml that are related to decrypt and buil… 

    …der features that are not present currently
    @carl-wallace
    carl-wallace committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    5c2dc55 View commit details
    Browse the repository at this point in the history

  4. more cleanup

    @carl-wallace
    carl-wallace committed Jul 24, 2023
    Configuration menu
    Copy the full SHA
    9fd56c0 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2023

  1. Merge branch 'master' into pkcs12_encoder_decoder

    @carl-wallace
    carl-wallace committed Sep 6, 2023
    Configuration menu
    Copy the full SHA
    c945555 View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. address a few review comments (several lifetime names, a stale TODO)

    @carl-wallace
    carl-wallace committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    a148821 View commit details
    Browse the repository at this point in the history