projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add additional DigestInfo checks.
[openssl.git]
/
crypto
/
pkcs7
/
pkcs7.h
diff --git
a/crypto/pkcs7/pkcs7.h
b/crypto/pkcs7/pkcs7.h
index 7191fcf1802d5979531c822d705fc47e76268b6f..04f60379fb6d2f4bd78921c2ecec705e8b45ec23 100644
(file)
--- a/
crypto/pkcs7/pkcs7.h
+++ b/
crypto/pkcs7/pkcs7.h
@@
-383,8
+383,6
@@
int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
int SMIME_write_PKCS7(BIO *bio, PKCS7 *p7, BIO *data, int flags);
PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
-int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
-int SMIME_text(BIO *in, BIO *out);
BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
@@
-455,6
+453,7
@@
void ERR_load_PKCS7_strings(void);
#define PKCS7_R_ERROR_SETTING_CIPHER 121
#define PKCS7_R_INVALID_MIME_TYPE 131
#define PKCS7_R_INVALID_NULL_POINTER 143
#define PKCS7_R_ERROR_SETTING_CIPHER 121
#define PKCS7_R_INVALID_MIME_TYPE 131
#define PKCS7_R_INVALID_NULL_POINTER 143
+#define PKCS7_R_INVALID_SIGNED_DATA_TYPE 155
#define PKCS7_R_MIME_NO_CONTENT_TYPE 132
#define PKCS7_R_MIME_PARSE_ERROR 133
#define PKCS7_R_MIME_SIG_PARSE_ERROR 134
#define PKCS7_R_MIME_NO_CONTENT_TYPE 132
#define PKCS7_R_MIME_PARSE_ERROR 133
#define PKCS7_R_MIME_SIG_PARSE_ERROR 134