Complete rewrite of the error code generation script. It now runs as a single

[openssl.git] / crypto / pkcs7 / verify.c

diff --git a/crypto/pkcs7/verify.c b/crypto/pkcs7/verify.c
index bce20ee20fd8dc118518bffb5a9773301b9943f9..71a67df3d457c2e939f6580080b5097f0db9a3cf 100644 (file)
--- a/crypto/pkcs7/verify.c
+++ b/crypto/pkcs7/verify.c
@@ -1,12 +1,70 @@
+/* crypto/pkcs7/verify.c */
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
+ *
+ * This package is an SSL implementation written
+ * by Eric Young (eay@cryptsoft.com).
+ * The implementation was written so as to conform with Netscapes SSL.
+ * 
+ * This library is free for commercial and non-commercial use as long as
+ * the following conditions are aheared to.  The following conditions
+ * apply to all code found in this distribution, be it the RC4, RSA,
+ * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
+ * included with this distribution is covered by the same copyright terms
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
+ * 
+ * Copyright remains Eric Young's, and as such any Copyright notices in
+ * the code are not to be removed.
+ * If this package is used in a product, Eric Young should be given attribution
+ * as the author of the parts of the library used.
+ * This can be in the form of a textual message at program startup or
+ * in documentation (online or textual) provided with the package.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *    "This product includes cryptographic software written by
+ *     Eric Young (eay@cryptsoft.com)"
+ *    The word 'cryptographic' can be left out if the rouines from the library
+ *    being used are not cryptographic related :-).
+ * 4. If you include any Windows specific code (or a derivative thereof) from 
+ *    the apps directory (application code) you must include an acknowledgement:
+ *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
+ * 
+ * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * 
+ * The licence and distribution terms for any publically available version or
+ * derivative of this code cannot be changed.  i.e. this code cannot simply be
+ * copied and put under another distribution licence
+ * [including the GNU Public Licence.]
+ */
 #include <stdio.h>
-#include "asn1.h"
-#include "bio.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/asn1.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 int verify_callback(int ok, X509_STORE_CTX *ctx);
 
 BIO *bio_err=NULL;
+BIO *bio_out=NULL;
 
 main(argc,argv)
 int argc;
@@ -27,6 +85,7 @@ char *argv[];
        STACK *sk;
 
        bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
+       bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
        EVP_add_digest(EVP_md2());
        EVP_add_digest(EVP_md5());
        EVP_add_digest(EVP_sha1());
@@ -74,10 +133,10 @@ again:
        X509_STORE_load_locations(cert_store,NULL,"../../certs");
        X509_STORE_set_verify_cb_func(cert_store,verify_callback);
 
-       ERR_clear_errors();
+       ERR_clear_error();
 
        /* We need to process the data */
-       if (PKCS7_get_detached(p7))
+       if ((PKCS7_get_detached(p7) || detached))
                {
                if (detached == NULL)
                        {
@@ -111,10 +170,27 @@ again:
        /* Ok, first we need to, for each subject entry, see if we can verify */
        for (i=0; i<sk_num(sk); i++)
                {
+               ASN1_UTCTIME *tm;
+               char *str1,*str2;
+
                si=(PKCS7_SIGNER_INFO *)sk_value(sk,i);
                i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);
                if (i <= 0)
                        goto err;
+               printf("signer info\n");
+               if ((tm=get_signed_time(si)) != NULL)
+                       {
+                       BIO_printf(bio_out,"Signed time:");
+                       ASN1_UTCTIME_print(bio_out,tm);
+                       ASN1_UTCTIME_free(tm);
+                       BIO_printf(bio_out,"\n");
+                       }
+               if (get_signed_seq2string(si,&str1,&str2))
+                       {
+                       BIO_printf(bio_out,"String 1 is %s\n",str1);
+                       BIO_printf(bio_out,"String 2 is %s\n",str2);
+                       }
+
                }
 
        X509_STORE_free(cert_store);
@@ -128,9 +204,7 @@ err:
        }
 
 /* should be X509 * but we can just have them as char *. */
-int verify_callback(ok, ctx)
-int ok;
-X509_STORE_CTX *ctx;
+int verify_callback(int ok, X509_STORE_CTX *ctx)
        {
        char buf[256];
        X509 *err_cert;