diff options
| author | jsing <> | 2016-12-27 15:31:16 +0000 |
|---|---|---|
| committer | jsing <> | 2016-12-27 15:31:16 +0000 |
| commit | fdcb375812a6e63590fccfc7ee8e2b585302788e (patch) | |
| tree | 2dd9a8d48bc228ea09e98e82c9546cd8cf5415c4 /src | |
| parent | 25e6c9f436d7a9241761f0e65e729f852fe4073f (diff) | |
| download | openbsd-fdcb375812a6e63590fccfc7ee8e2b585302788e.tar.gz openbsd-fdcb375812a6e63590fccfc7ee8e2b585302788e.tar.bz2 openbsd-fdcb375812a6e63590fccfc7ee8e2b585302788e.zip | |
Expand DECLARE_ASN1_ITEM macros - no change to preprocessor output.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/pkcs12.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h index 6061bef185..2d7cf24849 100644 --- a/src/lib/libcrypto/pkcs12/pkcs12.h +++ b/src/lib/libcrypto/pkcs12/pkcs12.h | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pkcs12.h,v 1.14 2016/09/04 17:19:33 jsing Exp $ */ | 1 | /* $OpenBSD: pkcs12.h,v 1.15 2016/12/27 15:31:16 jsing Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 1999. | 3 | * project 1999. |
| 4 | */ | 4 | */ |
| @@ -255,8 +255,8 @@ PKCS12_BAGS *d2i_PKCS12_BAGS(PKCS12_BAGS **a, const unsigned char **in, long len | |||
| 255 | int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out); | 255 | int i2d_PKCS12_BAGS(PKCS12_BAGS *a, unsigned char **out); |
| 256 | extern const ASN1_ITEM PKCS12_BAGS_it; | 256 | extern const ASN1_ITEM PKCS12_BAGS_it; |
| 257 | 257 | ||
| 258 | DECLARE_ASN1_ITEM(PKCS12_SAFEBAGS) | 258 | extern const ASN1_ITEM PKCS12_SAFEBAGS_it; |
| 259 | DECLARE_ASN1_ITEM(PKCS12_AUTHSAFES) | 259 | extern const ASN1_ITEM PKCS12_AUTHSAFES_it; |
| 260 | 260 | ||
| 261 | void PKCS12_PBE_add(void); | 261 | void PKCS12_PBE_add(void); |
| 262 | int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, | 262 | int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, |