diff options
author | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2014-12-20 12:06:03 +0100 |
commit | 5f6cb652dbd2ef0879673cf7338520dc2be236b9 (patch) | |
tree | bc47c8ccbcd48bfc5aee6b404c8ef3f1d9a359cb /app/openssl/crypto/pkcs7/pkcs7.h | |
parent | 576b0c26baf9b5b1418650a572604325ca7fb3af (diff) | |
parent | f347c871d0433ef3efb85beb5e386b58d700faad (diff) |
Merge branch 'develop'
Diffstat (limited to 'app/openssl/crypto/pkcs7/pkcs7.h')
-rw-r--r-- | app/openssl/crypto/pkcs7/pkcs7.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/app/openssl/crypto/pkcs7/pkcs7.h b/app/openssl/crypto/pkcs7/pkcs7.h index 04f60379..5d54c4ac 100644 --- a/app/openssl/crypto/pkcs7/pkcs7.h +++ b/app/openssl/crypto/pkcs7/pkcs7.h @@ -233,10 +233,6 @@ DECLARE_PKCS12_STACK_OF(PKCS7) (OBJ_obj2nid((a)->type) == NID_pkcs7_signedAndEnveloped) #define PKCS7_type_is_data(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_data) #define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest) -#define PKCS7_type_is_encrypted(a) \ - (OBJ_obj2nid((a)->type) == NID_pkcs7_encrypted) - -#define PKCS7_type_is_digest(a) (OBJ_obj2nid((a)->type) == NID_pkcs7_digest) #define PKCS7_set_detached(p,v) \ PKCS7_ctrl(p,PKCS7_OP_SET_DETACHED_SIGNATURE,v,NULL) |