diff options
| author | markus <> | 2002-09-05 22:44:52 +0000 |
|---|---|---|
| committer | markus <> | 2002-09-05 22:44:52 +0000 |
| commit | 715a204e4615e4a70a466fcb383a9a57cad5e6b8 (patch) | |
| tree | 2d2e93c4a34d1f7f04aba73706353332d7700641 /src/lib/libcrypto/pkcs12/pkcs12.h | |
| parent | 15b5d84f9da2ce4bfae8580e56e34a859f74ad71 (diff) | |
| download | openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.tar.gz openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.tar.bz2 openbsd-715a204e4615e4a70a466fcb383a9a57cad5e6b8.zip | |
import openssl-0.9.7-beta3
Diffstat (limited to 'src/lib/libcrypto/pkcs12/pkcs12.h')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/pkcs12.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h index 1786b6d4f3..dd338f266c 100644 --- a/src/lib/libcrypto/pkcs12/pkcs12.h +++ b/src/lib/libcrypto/pkcs12/pkcs12.h | |||
| @@ -156,8 +156,8 @@ union { | |||
| 156 | #define M_PKCS12_decrypt_skey PKCS12_decrypt_skey | 156 | #define M_PKCS12_decrypt_skey PKCS12_decrypt_skey |
| 157 | #define M_PKCS8_decrypt PKCS8_decrypt | 157 | #define M_PKCS8_decrypt PKCS8_decrypt |
| 158 | 158 | ||
| 159 | #define M_PKCS12_bag_type(bag) OBJ_obj2nid(bag->type) | 159 | #define M_PKCS12_bag_type(bg) OBJ_obj2nid((bg)->type) |
| 160 | #define M_PKCS12_cert_bag_type(bag) OBJ_obj2nid(bag->value.bag->type) | 160 | #define M_PKCS12_cert_bag_type(bg) OBJ_obj2nid((bg)->value.bag->type) |
| 161 | #define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type | 161 | #define M_PKCS12_crl_bag_type M_PKCS12_cert_bag_type |
| 162 | 162 | ||
| 163 | #define PKCS12_get_attr(bag, attr_nid) \ | 163 | #define PKCS12_get_attr(bag, attr_nid) \ |