Ruby needs some of the ASN.1 structs, move those back :(

aws · Nov 26, 2024 · 53cca61 · 53cca61
1 parent 8ce46b9
commit 53cca61
Show file tree

Hide file tree

Showing 2 changed files with 92 additions and 93 deletions.
diff --git a/crypto/pkcs7/internal.h b/crypto/pkcs7/internal.h
@@ -33,99 +33,6 @@ DECLARE_ASN1_FUNCTIONS(PKCS7_SIGN_ENVELOPE)
 
 DEFINE_STACK_OF(PKCS7)
 
-// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-10.2
-//
-//   RecipientInfo ::= SEQUENCE {
-//     version Version,
-//     issuerAndSerialNumber IssuerAndSerialNumber,
-//     keyEncryptionAlgorithm
-//
-//       KeyEncryptionAlgorithmIdentifier,
-//     encryptedKey EncryptedKey }
-//
-//   EncryptedKey ::= OCTET STRING
-struct pkcs7_recip_info_st {
-  ASN1_INTEGER *version;
-  PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-  X509_ALGOR *key_enc_algor;
-  ASN1_OCTET_STRING *enc_key;
-  X509 *cert;  // NOTE: |cert| is not serialized
-};
-
-// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-9.2
-//
-//   SignerInfo ::= SEQUENCE {
-//     version Version,
-//     issuerAndSerialNumber IssuerAndSerialNumber,
-//     digestAlgorithm DigestAlgorithmIdentifier,
-//     authenticatedAttributes
-//       [0] IMPLICIT Attributes OPTIONAL,
-//     digestEncryptionAlgorithm
-//       DigestEncryptionAlgorithmIdentifier,
-//     encryptedDigest EncryptedDigest,
-//     unauthenticatedAttributes
-//       [1] IMPLICIT Attributes OPTIONAL }
-//
-//   EncryptedDigest ::= OCTET STRING
-struct pkcs7_signer_info_st {
-  ASN1_INTEGER *version;
-  PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
-  X509_ALGOR *digest_alg;
-  STACK_OF(X509_ATTRIBUTE) *auth_attr;
-  X509_ALGOR *digest_enc_alg;
-  ASN1_OCTET_STRING *enc_digest;
-  STACK_OF(X509_ATTRIBUTE) *unauth_attr;
-  EVP_PKEY *pkey;  // NOTE: |pkey| is not seriliazed.
-};
-
-
-// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-10.1
-//
-//    EnvelopedData ::= SEQUENCE {
-//      version Version,
-//      recipientInfos RecipientInfos,
-//      encryptedContentInfo EncryptedContentInfo }
-//
-//    RecipientInfos ::= SET OF RecipientInfo
-struct pkcs7_envelope_st {
-  ASN1_INTEGER *version;
-  PKCS7_ENC_CONTENT *enc_data;
-  STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-};
-
-// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-11.1
-//
-//   SignedAndEnvelopedData ::= SEQUENCE {
-//     version Version,
-//     recipientInfos RecipientInfos,
-//     digestAlgorithms DigestAlgorithmIdentifiers,
-//     encryptedContentInfo EncryptedContentInfo,
-//     certificates
-//        [0] IMPLICIT ExtendedCertificatesAndCertificates
-//          OPTIONAL,
-//     crls
-//       [1] IMPLICIT CertificateRevocationLists OPTIONAL,
-//     signerInfos SignerInfos }
-struct pkcs7_sign_envelope_st {
-  ASN1_INTEGER *version;
-  STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
-  STACK_OF(X509_ALGOR) *md_algs;
-  PKCS7_ENC_CONTENT *enc_data;
-  STACK_OF(X509) *cert;
-  STACK_OF(X509_CRL) *crl;
-  STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
-};
-
-// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-6.7
-//
-//   IssuerAndSerialNumber ::= SEQUENCE {
-//     issuer Name,
-//     serialNumber CertificateSerialNumber }
-struct pkcs7_issuer_and_serial_st {
-  X509_NAME *issuer;
-  ASN1_INTEGER *serial;
-};
-
 // ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-10.1
 //
 //   EncryptedContentInfo ::= SEQUENCE {

diff --git a/include/openssl/pkcs7.h b/include/openssl/pkcs7.h
@@ -158,6 +158,98 @@ struct pkcs7_signed_st {
   STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
 };
 
+// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-9.2
+//
+//   SignerInfo ::= SEQUENCE {
+//     version Version,
+//     issuerAndSerialNumber IssuerAndSerialNumber,
+//     digestAlgorithm DigestAlgorithmIdentifier,
+//     authenticatedAttributes
+//       [0] IMPLICIT Attributes OPTIONAL,
+//     digestEncryptionAlgorithm
+//       DigestEncryptionAlgorithmIdentifier,
+//     encryptedDigest EncryptedDigest,
+//     unauthenticatedAttributes
+//       [1] IMPLICIT Attributes OPTIONAL }
+//
+//   EncryptedDigest ::= OCTET STRING
+struct pkcs7_signer_info_st {
+  ASN1_INTEGER *version;
+  PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
+  X509_ALGOR *digest_alg;
+  STACK_OF(X509_ATTRIBUTE) *auth_attr;
+  X509_ALGOR *digest_enc_alg;
+  ASN1_OCTET_STRING *enc_digest;
+  STACK_OF(X509_ATTRIBUTE) *unauth_attr;
+  EVP_PKEY *pkey;  // NOTE: |pkey| is not seriliazed.
+};
+
+// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-11.1
+//
+//   SignedAndEnvelopedData ::= SEQUENCE {
+//     version Version,
+//     recipientInfos RecipientInfos,
+//     digestAlgorithms DigestAlgorithmIdentifiers,
+//     encryptedContentInfo EncryptedContentInfo,
+//     certificates
+//        [0] IMPLICIT ExtendedCertificatesAndCertificates
+//          OPTIONAL,
+//     crls
+//       [1] IMPLICIT CertificateRevocationLists OPTIONAL,
+//     signerInfos SignerInfos }
+struct pkcs7_sign_envelope_st {
+  ASN1_INTEGER *version;
+  STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
+  STACK_OF(X509_ALGOR) *md_algs;
+  PKCS7_ENC_CONTENT *enc_data;
+  STACK_OF(X509) *cert;
+  STACK_OF(X509_CRL) *crl;
+  STACK_OF(PKCS7_SIGNER_INFO) *signer_info;
+};
+
+// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-10.1
+//
+//    EnvelopedData ::= SEQUENCE {
+//      version Version,
+//      recipientInfos RecipientInfos,
+//      encryptedContentInfo EncryptedContentInfo }
+//
+//    RecipientInfos ::= SET OF RecipientInfo
+struct pkcs7_envelope_st {
+  ASN1_INTEGER *version;
+  PKCS7_ENC_CONTENT *enc_data;
+  STACK_OF(PKCS7_RECIP_INFO) *recipientinfo;
+};
+
+// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-10.2
+//
+//   RecipientInfo ::= SEQUENCE {
+//     version Version,
+//     issuerAndSerialNumber IssuerAndSerialNumber,
+//     keyEncryptionAlgorithm
+//
+//       KeyEncryptionAlgorithmIdentifier,
+//     encryptedKey EncryptedKey }
+//
+//   EncryptedKey ::= OCTET STRING
+struct pkcs7_recip_info_st {
+  ASN1_INTEGER *version;
+  PKCS7_ISSUER_AND_SERIAL *issuer_and_serial;
+  X509_ALGOR *key_enc_algor;
+  ASN1_OCTET_STRING *enc_key;
+  X509 *cert;  // NOTE: |cert| is not serialized
+};
+
+// ASN.1 defined here https://datatracker.ietf.org/doc/html/rfc2315#section-6.7
+//
+//   IssuerAndSerialNumber ::= SEQUENCE {
+//     issuer Name,
+//     serialNumber CertificateSerialNumber }
+struct pkcs7_issuer_and_serial_st {
+  X509_NAME *issuer;
+  ASN1_INTEGER *serial;
+};
+
 // Only declare ASN1 functions or define stacks publibly if needed by supported
 // projects that depend on them.
 DECLARE_ASN1_FUNCTIONS(PKCS7)