8 files changed, 175 insertions, 87 deletions

diff --git a/src/lib/libcrypto/pkcs7/bio_ber.c b/src/lib/libcrypto/pkcs7/bio_ber.c
index 2f17723e98..42331f7ab0 100644
--- a/src/lib/libcrypto/pkcs7/bio_ber.c
+++ b/src/lib/libcrypto/pkcs7/bio_ber.c
@@ -69,6 +69,7 @@ static int ber_read(BIO *h,char *buf,int size);
 static long ber_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int ber_new(BIO *h);
 static int ber_free(BIO *data);
+static long ber_callback_ctrl(BIO *h,int cmd,void *(*fp)());
 #define BER_BUF_SIZE    (32)
 
 /* This is used to hold the state of the BER objects being read. */
@@ -92,7 +93,7 @@ typedef struct bio_ber_struct
         /* most of the following are used when doing non-blocking IO */
         /* reading */
         long num_left;  /* number of bytes still to read/write in block */
-        int depth;      /* used with idefinite encoding. */
+        int depth;      /* used with indefinite encoding. */
         int finished;   /* No more read data */
 
         /* writting */ 
@@ -115,6 +116,7 @@ static BIO_METHOD methods_ber=
         ber_ctrl,
         ber_new,
         ber_free,
+        ber_callback_ctrl,
         };
 
 BIO_METHOD *BIO_f_ber(void)
@@ -126,7 +128,7 @@ static int ber_new(BIO *bi)
         {
         BIO_BER_CTX *ctx;
 
-        ctx=(BIO_BER_CTX *)Malloc(sizeof(BIO_BER_CTX));
+        ctx=(BIO_BER_CTX *)OPENSSL_malloc(sizeof(BIO_BER_CTX));
         if (ctx == NULL) return(0);
 
         memset((char *)ctx,0,sizeof(BIO_BER_CTX));
@@ -144,7 +146,7 @@ static int ber_free(BIO *a)
         if (a == NULL) return(0);
         b=(BIO_BER_CTX *)a->ptr;
         memset(a->ptr,0,sizeof(BIO_BER_CTX));
-        Free(a->ptr);
+        OPENSSL_free(a->ptr);
         a->ptr=NULL;
         a->init=0;
         a->flags=0;
@@ -337,7 +339,7 @@ static long ber_ctrl(BIO *b, int cmd, long num, char *ptr)
         case BIO_CTRL_RESET:
                 ctx->ok=1;
                 ctx->finished=0;
-                EVP_CipherInit(&(ctx->cipher),NULL,NULL,NULL,
+                EVP_CipherInit_ex(&(ctx->cipher),NULL,NULL,NULL,NULL,
                         ctx->cipher.berrypt);
                 ret=BIO_ctrl(b->next_bio,cmd,num,ptr);
                 break;
@@ -374,7 +376,7 @@ again:
                         {
                         ctx->finished=1;
                         ctx->buf_off=0;
-                        ret=EVP_CipherFinal(&(ctx->cipher),
+                        ret=EVP_CipherFinal_ex(&(ctx->cipher),
                                 (unsigned char *)ctx->buf,
                                 &(ctx->buf_len));
                         ctx->ok=(int)ret;
@@ -409,6 +411,20 @@ again:
         return(ret);
         }
 
+static long ber_callback_ctrl(BIO *b, int cmd, void *(*fp)())
+        {
+        long ret=1;
+
+        if (b->next_bio == NULL) return(0);
+        switch (cmd)
+                {
+        default:
+                ret=BIO_callback_ctrl(b->next_bio,cmd,fp);
+                break;
+                }
+        return(ret);
+        }
+
 /*
 void BIO_set_cipher_ctx(b,c)
 BIO *b;
@@ -442,7 +458,7 @@ void BIO_set_cipher(BIO *b, EVP_CIPHER *c, unsigned char *k, unsigned char *i,
 
         b->init=1;
         ctx=(BIO_ENC_CTX *)b->ptr;
-        EVP_CipherInit(&(ctx->cipher),c,k,i,e);
+        EVP_CipherInit_ex(&(ctx->cipher),c,NULL,k,i,e);
         
         if (b->callback != NULL)
                 b->callback(b,BIO_CB_CTRL,(char *)c,BIO_CTRL_SET,e,1L);
diff --git a/src/lib/libcrypto/pkcs7/dec.c b/src/lib/libcrypto/pkcs7/dec.c
index b3661f28d3..6752ec568a 100644
--- a/src/lib/libcrypto/pkcs7/dec.c
+++ b/src/lib/libcrypto/pkcs7/dec.c
@@ -57,6 +57,7 @@
  */
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <openssl/bio.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
@@ -85,7 +86,7 @@ char *argv[];
         int i,printit=0;
         STACK_OF(PKCS7_SIGNER_INFO) *sk;
 
-        SSLeay_add_all_algorithms();
+        OpenSSL_add_all_algorithms();
         bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
         data=BIO_new(BIO_s_file());
@@ -121,9 +122,10 @@ char *argv[];
         }
 
         if ((in=BIO_new_file(keyfile,"r")) == NULL) goto err;
-        if ((x509=PEM_read_bio_X509(in,NULL,NULL)) == NULL) goto err;
+        if ((x509=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL) goto err;
         BIO_reset(in);
-        if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL)) == NULL) goto err;
+        if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL)) == NULL)
+                goto err;
         BIO_free(in);
 
         if (pp == NULL)
@@ -131,7 +133,7 @@ char *argv[];
 
 
         /* 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;
 
 
 
@@ -148,7 +150,7 @@ char *argv[];
         /* We need to process the data */
         /* We cannot support detached encryption */
         p7bio=PKCS7_dataDecode(p7,pkey,detached,x509);
-        
+
         if (p7bio == NULL)
                 {
                 printf("problems decoding\n");
diff --git a/src/lib/libcrypto/pkcs7/enc.c b/src/lib/libcrypto/pkcs7/enc.c
index 625a7c2285..7417f8a4e0 100644
--- a/src/lib/libcrypto/pkcs7/enc.c
+++ b/src/lib/libcrypto/pkcs7/enc.c
@@ -56,61 +56,91 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "bio.h"
-#include "x509.h"
-#include "pem.h"
+#include <string.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
 
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char *argv[];
         {
         X509 *x509;
-        EVP_PKEY *pkey;
         PKCS7 *p7;
-        PKCS7 *p7_data;
-        PKCS7_SIGNER_INFO *si;
         BIO *in;
         BIO *data,*p7bio;
         char buf[1024*4];
-        int i,j;
-        int nodetach=0;
+        int i;
+        int nodetach=1;
+        char *keyfile = NULL;
+        const EVP_CIPHER *cipher=NULL;
+        STACK_OF(X509) *recips=NULL;
 
-        EVP_add_digest(EVP_sha1());
-        EVP_add_cipher(EVP_des_cbc());
+        OpenSSL_add_all_algorithms();
 
         data=BIO_new(BIO_s_file());
-again:
-        if (argc > 1)
+        while(argc > 1)
                 {
                 if (strcmp(argv[1],"-nd") == 0)
                         {
                         nodetach=1;
                         argv++; argc--;
-                        goto again;
                         }
-                if (!BIO_read_filename(data,argv[1]))
-                        goto err;
-                }
-        else
-                BIO_set_fp(data,stdin,BIO_NOCLOSE);
+                else if ((strcmp(argv[1],"-c") == 0) && (argc >= 2)) {
+                        if(!(cipher = EVP_get_cipherbyname(argv[2]))) {
+                                fprintf(stderr, "Unknown cipher %s\n", argv[2]);
+                                goto err;
+                        }
+                        argc-=2;
+                        argv+=2;
+                } else if ((strcmp(argv[1],"-k") == 0) && (argc >= 2)) {
+                        keyfile = argv[2];
+                        argc-=2;
+                        argv+=2;
+                        if (!(in=BIO_new_file(keyfile,"r"))) goto err;
+                        if (!(x509=PEM_read_bio_X509(in,NULL,NULL,NULL)))
+                                goto err;
+                        if(!recips) recips = sk_X509_new_null();
+                        sk_X509_push(recips, x509);
+                        BIO_free(in);
+                } else break;
+        }
 
-        if ((in=BIO_new_file("server.pem","r")) == NULL) goto err;
-        if ((x509=PEM_read_bio_X509(in,NULL,NULL)) == NULL) goto err;
+        if(!recips) {
+                fprintf(stderr, "No recipients\n");
+                goto err;
+        }
+
+        if (!BIO_read_filename(data,argv[1])) goto err;
+
+        p7=PKCS7_new();
+#if 0
         BIO_reset(in);
         if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL)) == NULL) goto err;
         BIO_free(in);
-
-        p7=PKCS7_new();
         PKCS7_set_type(p7,NID_pkcs7_signedAndEnveloped);
          
         if (PKCS7_add_signature(p7,x509,pkey,EVP_sha1()) == NULL) goto err;
-
-        if (!PKCS7_set_cipher(p7,EVP_des_cbc())) goto err;
-        if (PKCS7_add_recipient(p7,x509) == NULL) goto err;
-
         /* we may want to add more */
         PKCS7_add_certificate(p7,x509);
+#else
+        PKCS7_set_type(p7,NID_pkcs7_enveloped);
+#endif
+        if(!cipher)     {
+#ifndef OPENSSL_NO_DES
+                cipher = EVP_des_ede3_cbc();
+#else
+                fprintf(stderr, "No cipher selected\n");
+                goto err;
+#endif
+        }
 
+        if (!PKCS7_set_cipher(p7,cipher)) goto err;
+        for(i = 0; i < sk_X509_num(recips); i++) {
+                if (!PKCS7_add_recipient(p7,sk_X509_value(recips, i))) goto err;
+        }
+        sk_X509_pop_free(recips, X509_free);
 
         /* Set the content of the signed to 'data' */
         /* PKCS7_content_new(p7,NID_pkcs7_data); not used in envelope */
@@ -129,7 +159,7 @@ again:
                 }
         BIO_flush(p7bio);
 
-        if (!PKCS7_dataSign(p7,p7bio)) goto err;
+        if (!PKCS7_dataFinal(p7,p7bio)) goto err;
         BIO_free(p7bio);
 
         PEM_write_PKCS7(stdout,p7);
diff --git a/src/lib/libcrypto/pkcs7/example.c b/src/lib/libcrypto/pkcs7/example.c
index 7354890084..c993947cc3 100644
--- a/src/lib/libcrypto/pkcs7/example.c
+++ b/src/lib/libcrypto/pkcs7/example.c
@@ -1,7 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <openssl/pkcs7.h>
 #include <openssl/asn1_mac.h>
+#include <openssl/x509.h>
 
 int add_signed_time(PKCS7_SIGNER_INFO *si)
         {
@@ -36,7 +38,7 @@ void add_signed_string(PKCS7_SIGNER_INFO *si, char *str)
                 signed_string_nid=
                         OBJ_create("1.2.3.4.5","OID_example","Our example OID");
         os=ASN1_OCTET_STRING_new();
-        ASN1_OCTET_STRING_set(os,str,strlen(str));
+        ASN1_OCTET_STRING_set(os,(unsigned char*)str,strlen(str));
         /* When we add, we do not free */
         PKCS7_add_signed_attribute(si,signed_string_nid,
                 V_ASN1_OCTET_STRING,(char *)os);
@@ -68,7 +70,7 @@ int get_signed_string(PKCS7_SIGNER_INFO *si, char *buf, int len)
         return(0);
         }
 
-static signed_seq2string_nid= -1;
+static int signed_seq2string_nid= -1;
 /* ########################################### */
 int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
         {
@@ -86,8 +88,8 @@ int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
 
         os1=ASN1_OCTET_STRING_new();
         os2=ASN1_OCTET_STRING_new();
-        ASN1_OCTET_STRING_set(os1,str1,strlen(str1));
-        ASN1_OCTET_STRING_set(os2,str1,strlen(str1));
+        ASN1_OCTET_STRING_set(os1,(unsigned char*)str1,strlen(str1));
+        ASN1_OCTET_STRING_set(os2,(unsigned char*)str1,strlen(str1));
         i =i2d_ASN1_OCTET_STRING(os1,NULL);
         i+=i2d_ASN1_OCTET_STRING(os2,NULL);
         total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
@@ -197,7 +199,7 @@ X509_ATTRIBUTE *create_string(char *str)
                 signed_string_nid=
                         OBJ_create("1.2.3.4.5","OID_example","Our example OID");
         os=ASN1_OCTET_STRING_new();
-        ASN1_OCTET_STRING_set(os,str,strlen(str));
+        ASN1_OCTET_STRING_set(os,(unsigned char*)str,strlen(str));
         /* When we add, we do not free */
         ret=X509_ATTRIBUTE_create(signed_string_nid,
                 V_ASN1_OCTET_STRING,(char *)os);
@@ -250,8 +252,8 @@ X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2)
 
         os1=ASN1_OCTET_STRING_new();
         os2=ASN1_OCTET_STRING_new();
-        ASN1_OCTET_STRING_set(os1,str1,strlen(str1));
-        ASN1_OCTET_STRING_set(os2,str1,strlen(str1));
+        ASN1_OCTET_STRING_set(os1,(unsigned char*)str1,strlen(str1));
+        ASN1_OCTET_STRING_set(os2,(unsigned char*)str1,strlen(str1));
         i =i2d_ASN1_OCTET_STRING(os1,NULL);
         i+=i2d_ASN1_OCTET_STRING(os2,NULL);
         total=ASN1_object_size(1,i,V_ASN1_SEQUENCE);
diff --git a/src/lib/libcrypto/pkcs7/pk7_dgst.c b/src/lib/libcrypto/pkcs7/pk7_dgst.c
index 7769abeb1e..90edfa5001 100644
--- a/src/lib/libcrypto/pkcs7/pk7_dgst.c
+++ b/src/lib/libcrypto/pkcs7/pk7_dgst.c
@@ -58,9 +58,9 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "rand.h"
-#include "objects.h"
-#include "x509.h"
-#include "pkcs7.h"
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
 
diff --git a/src/lib/libcrypto/pkcs7/pk7_enc.c b/src/lib/libcrypto/pkcs7/pk7_enc.c
index a5b6dc463f..acbb189c59 100644
--- a/src/lib/libcrypto/pkcs7/pk7_enc.c
+++ b/src/lib/libcrypto/pkcs7/pk7_enc.c
@@ -58,11 +58,11 @@
 
 #include <stdio.h>
 #include "cryptlib.h"
-#include "evp.h"
-#include "rand.h"
-#include "objects.h"
-#include "x509.h"
-#include "pkcs7.h"
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include <openssl/objects.h>
+#include <openssl/x509.h>
+#include <openssl/pkcs7.h>
 
 PKCS7_in_bio(PKCS7 *p7,BIO *in);
 PKCS7_out_bio(PKCS7 *p7,BIO *out);
diff --git a/src/lib/libcrypto/pkcs7/sign.c b/src/lib/libcrypto/pkcs7/sign.c
index ead1cb65ca..8b59885f7e 100644
--- a/src/lib/libcrypto/pkcs7/sign.c
+++ b/src/lib/libcrypto/pkcs7/sign.c
@@ -56,29 +56,38 @@
  * [including the GNU Public Licence.]
  */
 #include <stdio.h>
-#include "bio.h"
-#include "x509.h"
-#include "pem.h"
+#include <string.h>
+#include <openssl/bio.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/err.h>
 
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char *argv[];
         {
         X509 *x509;
         EVP_PKEY *pkey;
         PKCS7 *p7;
-        PKCS7 *p7_data;
         PKCS7_SIGNER_INFO *si;
         BIO *in;
         BIO *data,*p7bio;
         char buf[1024*4];
-        int i,j;
+        int i;
         int nodetach=0;
 
+#ifndef OPENSSL_NO_MD2
         EVP_add_digest(EVP_md2());
+#endif
+#ifndef OPENSSL_NO_MD5
         EVP_add_digest(EVP_md5());
+#endif
+#ifndef OPENSSL_NO_SHA1
         EVP_add_digest(EVP_sha1());
+#endif
+#ifndef OPENSSL_NO_MDC2
         EVP_add_digest(EVP_mdc2());
+#endif
 
         data=BIO_new(BIO_s_file());
 again:
@@ -97,15 +106,20 @@ again:
                 BIO_set_fp(data,stdin,BIO_NOCLOSE);
 
         if ((in=BIO_new_file("server.pem","r")) == NULL) goto err;
-        if ((x509=PEM_read_bio_X509(in,NULL,NULL)) == NULL) goto err;
+        if ((x509=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL) goto err;
         BIO_reset(in);
-        if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL)) == NULL) goto err;
+        if ((pkey=PEM_read_bio_PrivateKey(in,NULL,NULL,NULL)) == NULL) goto err;
         BIO_free(in);
 
         p7=PKCS7_new();
         PKCS7_set_type(p7,NID_pkcs7_signed);
          
-        if (PKCS7_add_signature(p7,x509,pkey,EVP_sha1()) == NULL) goto err;
+        si=PKCS7_add_signature(p7,x509,pkey,EVP_sha1());
+        if (si == NULL) goto err;
+
+        /* If you do this then you get signing time automatically added */
+        PKCS7_add_signed_attribute(si, NID_pkcs9_contentType, V_ASN1_OBJECT,
+                                                OBJ_nid2obj(NID_pkcs7_data));
 
         /* we may want to add more */
         PKCS7_add_certificate(p7,x509);
@@ -125,7 +139,7 @@ again:
                 BIO_write(p7bio,buf,i);
                 }
 
-        if (!PKCS7_dataSign(p7,p7bio)) goto err;
+        if (!PKCS7_dataFinal(p7,p7bio)) goto err;
         BIO_free(p7bio);
 
         PEM_write_PKCS7(stdout,p7);
diff --git a/src/lib/libcrypto/pkcs7/verify.c b/src/lib/libcrypto/pkcs7/verify.c
index 0e1c1b26dc..5f7afe8933 100644
--- a/src/lib/libcrypto/pkcs7/verify.c
+++ b/src/lib/libcrypto/pkcs7/verify.c
@@ -56,41 +56,50 @@
  * [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;
 
-main(argc,argv)
+int main(argc,argv)
 int argc;
 char *argv[];
         {
-        X509 *x509,*x;
         PKCS7 *p7;
-        PKCS7_SIGNED *s;
         PKCS7_SIGNER_INFO *si;
-        PKCS7_ISSUER_AND_SERIAL *ias;
         X509_STORE_CTX cert_ctx;
         X509_STORE *cert_store=NULL;
-        X509_LOOKUP *lookup=NULL;
         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);
+#ifndef OPENSSL_NO_MD2
         EVP_add_digest(EVP_md2());
+#endif
+#ifndef OPENSSL_NO_MD5
         EVP_add_digest(EVP_md5());
+#endif
+#ifndef OPENSSL_NO_SHA1
         EVP_add_digest(EVP_sha1());
+#endif
+#ifndef OPENSSL_NO_MDC2
         EVP_add_digest(EVP_mdc2());
+#endif
 
         data=BIO_new(BIO_s_file());
-again:
+
         pp=NULL;
         while (argc > 1)
                 {
@@ -121,7 +130,7 @@ again:
 
 
         /* 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 
@@ -131,10 +140,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)
                         {
@@ -166,12 +175,29 @@ again:
                 }
 
         /* 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++)
                 {
-                si=(PKCS7_SIGNER_INFO *)sk_value(sk,i);
+                ASN1_UTCTIME *tm;
+                char *str1,*str2;
+
+                si=sk_PKCS7_SIGNER_INFO_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);
@@ -185,9 +211,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;