diff options
Diffstat (limited to 'src/lib/libcrypto/pkcs7/pkcs7.h')
-rw-r--r-- | src/lib/libcrypto/pkcs7/pkcs7.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h index 6fd5adf457..6f0ccc0dc8 100644 --- a/src/lib/libcrypto/pkcs7/pkcs7.h +++ b/src/lib/libcrypto/pkcs7/pkcs7.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs7.h,v 1.22 2024/10/23 01:57:19 jsg Exp $ */ | 1 | /* $OpenBSD: pkcs7.h,v 1.24 2025/07/02 10:24:17 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -82,7 +82,7 @@ typedef struct pkcs7_issuer_and_serial_st { | |||
82 | } PKCS7_ISSUER_AND_SERIAL; | 82 | } PKCS7_ISSUER_AND_SERIAL; |
83 | 83 | ||
84 | typedef struct pkcs7_signer_info_st { | 84 | typedef struct pkcs7_signer_info_st { |
85 | ASN1_INTEGER *version; /* version 1 */ | 85 | ASN1_INTEGER *version; /* version 1 */ |
86 | PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; | 86 | PKCS7_ISSUER_AND_SERIAL *issuer_and_serial; |
87 | X509_ALGOR *digest_alg; | 87 | X509_ALGOR *digest_alg; |
88 | STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ | 88 | STACK_OF(X509_ATTRIBUTE) *auth_attr; /* [ 0 ] */ |
@@ -145,7 +145,7 @@ typedef struct pkcs7_signedandenveloped_st { | |||
145 | typedef struct pkcs7_digest_st { | 145 | typedef struct pkcs7_digest_st { |
146 | ASN1_INTEGER *version; /* version 0 */ | 146 | ASN1_INTEGER *version; /* version 0 */ |
147 | X509_ALGOR *md; /* md used */ | 147 | X509_ALGOR *md; /* md used */ |
148 | struct pkcs7_st *contents; | 148 | struct pkcs7_st *contents; |
149 | ASN1_OCTET_STRING *digest; | 149 | ASN1_OCTET_STRING *digest; |
150 | } PKCS7_DIGEST; | 150 | } PKCS7_DIGEST; |
151 | 151 | ||
@@ -362,7 +362,7 @@ PKCS7_ISSUER_AND_SERIAL *PKCS7_get_issuer_and_serial(PKCS7 *p7, int idx); | |||
362 | ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk); | 362 | ASN1_OCTET_STRING *PKCS7_digest_from_attributes(STACK_OF(X509_ATTRIBUTE) *sk); |
363 | int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type, | 363 | int PKCS7_add_signed_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int type, |
364 | void *data); | 364 | void *data); |
365 | int PKCS7_add_attribute (PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, | 365 | int PKCS7_add_attribute(PKCS7_SIGNER_INFO *p7si, int nid, int atrtype, |
366 | void *value); | 366 | void *value); |
367 | ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid); | 367 | ASN1_TYPE *PKCS7_get_attribute(PKCS7_SIGNER_INFO *si, int nid); |
368 | ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid); | 368 | ASN1_TYPE *PKCS7_get_signed_attribute(PKCS7_SIGNER_INFO *si, int nid); |