More S/MIME tidy. Place some common attribute operations in utility

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

diff --git a/crypto/pkcs7/pk7_attr.c b/crypto/pkcs7/pk7_attr.c
index 5ff5a88b5cfc371a096496c1ccc51b30a534eb30..5ad6670a4e11c5c283d5f2a070db01a56e41e18c 100644 (file)
--- a/crypto/pkcs7/pk7_attr.c
+++ b/crypto/pkcs7/pk7_attr.c
@@ -3,7 +3,7 @@
  * project 2001.
  */
 /* ====================================================================
- * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 2001-2004 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -94,17 +94,19 @@ int PKCS7_add_attrib_smimecap(PKCS7_SIGNER_INFO *si, STACK_OF(X509_ALGOR) *cap)
 }
 
 STACK_OF(X509_ALGOR) *PKCS7_get_smimecap(PKCS7_SIGNER_INFO *si)
-{
+       {
        ASN1_TYPE *cap;
-       unsigned char *p;
+       const unsigned char *p;
+
        cap = PKCS7_get_signed_attribute(si, NID_SMIMECapabilities);
-       if (!cap) return NULL;
+       if (!cap || (cap->type != V_ASN1_SEQUENCE))
+               return NULL;
        p = cap->value.sequence->data;
        return d2i_ASN1_SET_OF_X509_ALGOR(NULL, &p,
                                          cap->value.sequence->length,
                                          d2i_X509_ALGOR, X509_ALGOR_free,
                                          V_ASN1_SEQUENCE, V_ASN1_UNIVERSAL);
-}
+       }
 
 /* Basic smime-capabilities OID and optional integer arg */
 int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
@@ -137,3 +139,42 @@ int PKCS7_simple_smimecap(STACK_OF(X509_ALGOR) *sk, int nid, int arg)
        sk_X509_ALGOR_push (sk, alg);
        return 1;
 }
+
+int PKCS7_add_attrib_content_type(PKCS7_SIGNER_INFO *si, ASN1_OBJECT *coid)
+       {
+       if (PKCS7_get_signed_attribute(si, NID_pkcs9_contentType))
+               return 0;
+       if (!coid)
+               coid = OBJ_nid2obj(NID_pkcs7_data);
+       return PKCS7_add_signed_attribute(si, NID_pkcs9_contentType,
+                               V_ASN1_OBJECT, coid);
+       }
+
+int PKCS7_add0_attrib_signing_time(PKCS7_SIGNER_INFO *si, ASN1_TIME *t)
+       {
+       if (!t && !(t=X509_gmtime_adj(NULL,0)))
+               {
+               PKCS7err(PKCS7_F_PKCS7_ADD0_ATTRIB_SIGNING_TIME,
+                               ERR_R_MALLOC_FAILURE);
+               return 0;
+               }
+       return PKCS7_add_signed_attribute(si, NID_pkcs9_signingTime,
+                                               V_ASN1_UTCTIME, t);
+       }
+
+int PKCS7_add1_attrib_digest(PKCS7_SIGNER_INFO *si,
+                               const unsigned char *md, int mdlen)
+       {
+       ASN1_OCTET_STRING *os;
+       os = ASN1_OCTET_STRING_new();
+       if (!os)
+               return 0;
+       if (!ASN1_STRING_set(os, md, mdlen)
+               || PKCS7_add_signed_attribute(si, NID_pkcs9_messageDigest,
+                                               V_ASN1_OCTET_STRING, os))
+               {
+               ASN1_OCTET_STRING_free(os);
+               return 0;
+               }
+       return 1;
+       }