projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix from stable branch.
[openssl.git]
/
crypto
/
pkcs7
/
verify.c
diff --git
a/crypto/pkcs7/verify.c
b/crypto/pkcs7/verify.c
index d2d46d4aa465f58693a7fe88f5d34c29266d3485..b40f26032ec6f761c874264f2f28886061cf4ffe 100644
(file)
--- a/
crypto/pkcs7/verify.c
+++ b/
crypto/pkcs7/verify.c
@@
-56,43
+56,50
@@
* [including the GNU Public Licence.]
*/
#include <stdio.h>
* [including the GNU Public Licence.]
*/
#include <stdio.h>
-#include "asn1.h"
-#include "bio.h"
-#include "x509.h"
-#include "pem.h"
+#include <string.h>
+#include <openssl/bio.h>
+#include <openssl/asn1.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
+#include "example.h"
int verify_callback(int ok, X509_STORE_CTX *ctx);
BIO *bio_err=NULL;
BIO *bio_out=NULL;
int verify_callback(int ok, X509_STORE_CTX *ctx);
BIO *bio_err=NULL;
BIO *bio_out=NULL;
-main(argc,argv)
+
int
main(argc,argv)
int argc;
char *argv[];
{
int argc;
char *argv[];
{
- X509 *x509,*x;
PKCS7 *p7;
PKCS7 *p7;
- PKCS7_SIGNED *s;
PKCS7_SIGNER_INFO *si;
PKCS7_SIGNER_INFO *si;
- PKCS7_ISSUER_AND_SERIAL *ias;
X509_STORE_CTX cert_ctx;
X509_STORE *cert_store=NULL;
X509_STORE_CTX cert_ctx;
X509_STORE *cert_store=NULL;
- X509_LOOKUP *lookup=NULL;
BIO *data,*detached=NULL,*p7bio=NULL;
char buf[1024*4];
BIO *data,*detached=NULL,*p7bio=NULL;
char buf[1024*4];
-
unsigned char *p,
*pp;
- int i,
j,
printit=0;
- STACK *sk;
+
char
*pp;
+ int i,printit=0;
+ STACK
_OF(PKCS7_SIGNER_INFO)
*sk;
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
+#ifndef OPENSSL_NO_MD2
EVP_add_digest(EVP_md2());
EVP_add_digest(EVP_md2());
+#endif
+#ifndef OPENSSL_NO_MD5
EVP_add_digest(EVP_md5());
EVP_add_digest(EVP_md5());
+#endif
+#ifndef OPENSSL_NO_SHA1
EVP_add_digest(EVP_sha1());
EVP_add_digest(EVP_sha1());
+#endif
+#ifndef OPENSSL_NO_MDC2
EVP_add_digest(EVP_mdc2());
EVP_add_digest(EVP_mdc2());
+#endif
data=BIO_new(BIO_s_file());
data=BIO_new(BIO_s_file());
-again:
+
pp=NULL;
while (argc > 1)
{
pp=NULL;
while (argc > 1)
{
@@
-123,7
+130,7
@@
again:
/* Load the PKCS7 object from a file */
/* Load the PKCS7 object from a file */
- if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL)) == NULL) goto err;
+ if ((p7=PEM_read_bio_PKCS7(data,NULL,NULL
,NULL
)) == NULL) goto err;
/* This stuff is being setup for certificate verification.
* When using SSL, it could be replaced with a
/* This stuff is being setup for certificate verification.
* When using SSL, it could be replaced with a
@@
-168,14
+175,15
@@
again:
}
/* Ok, first we need to, for each subject entry, see if we can verify */
}
/* Ok, first we need to, for each subject entry, see if we can verify */
- for (i=0; i<sk_num(sk); i++)
+ for (i=0; i<sk_
PKCS7_SIGNER_INFO_
num(sk); i++)
{
ASN1_UTCTIME *tm;
char *str1,*str2;
{
ASN1_UTCTIME *tm;
char *str1,*str2;
+ int rc;
- si=
(PKCS7_SIGNER_INFO *)sk
_value(sk,i);
-
i
=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
- if (
i
<= 0)
+ si=
sk_PKCS7_SIGNER_INFO
_value(sk,i);
+
rc
=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
+ if (
rc
<= 0)
goto err;
printf("signer info\n");
if ((tm=get_signed_time(si)) != NULL)
goto err;
printf("signer info\n");
if ((tm=get_signed_time(si)) != NULL)