Add accessors for request and CRL signatures
[openssl.git] / crypto / x509 / x509cset.c
index 6cac440ea936b68fa2131f8b968c59e4044af4e7..4dbe6d087f759a22002a7fce25269a21db6cabd5 100644 (file)
@@ -1,6 +1,7 @@
 /* crypto/x509/x509cset.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
- * project 2001.
+/*
+ * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL project
+ * 2001.
  */
 /* ====================================================================
  * Copyright (c) 2001 The OpenSSL Project.  All rights reserved.
@@ -10,7 +11,7 @@
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
+ *    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
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/objects.h>
 #include <openssl/evp.h>
 #include <openssl/x509.h>
+#include "internal/x509_int.h"
 
 int X509_CRL_set_version(X509_CRL *x, long version)
-       {
-       if (x == NULL) return(0);
-       if (x->crl->version == NULL)
-               {
-               if ((x->crl->version=M_ASN1_INTEGER_new()) == NULL)
-                       return(0);
-               }
-       return(ASN1_INTEGER_set(x->crl->version,version));
-       }
+{
+    if (x == NULL)
+        return (0);
+    if (x->crl.version == NULL) {
+        if ((x->crl.version = ASN1_INTEGER_new()) == NULL)
+            return (0);
+    }
+    return (ASN1_INTEGER_set(x->crl.version, version));
+}
 
 int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name)
-       {
-       if ((x == NULL) || (x->crl == NULL)) return(0);
-       return(X509_NAME_set(&x->crl->issuer,name));
-       }
-
-
-int X509_CRL_set_lastUpdate(X509_CRL *x, ASN1_TIME *tm)
-       {
-       ASN1_TIME *in;
-
-       if (x == NULL) return(0);
-       in=x->crl->lastUpdate;
-       if (in != tm)
-               {
-               in=M_ASN1_TIME_dup(tm);
-               if (in != NULL)
-                       {
-                       M_ASN1_TIME_free(x->crl->lastUpdate);
-                       x->crl->lastUpdate=in;
-                       }
-               }
-       return(in != NULL);
-       }
-
-int X509_CRL_set_nextUpdate(X509_CRL *x, ASN1_TIME *tm)
-       {
-       ASN1_TIME *in;
-
-       if (x == NULL) return(0);
-       in=x->crl->nextUpdate;
-       if (in != tm)
-               {
-               in=M_ASN1_TIME_dup(tm);
-               if (in != NULL)
-                       {
-                       M_ASN1_TIME_free(x->crl->nextUpdate);
-                       x->crl->nextUpdate=in;
-                       }
-               }
-       return(in != NULL);
-       }
+{
+    if (x == NULL)
+        return (0);
+    return (X509_NAME_set(&x->crl.issuer, name));
+}
+
+int X509_CRL_set_lastUpdate(X509_CRL *x, const ASN1_TIME *tm)
+{
+    ASN1_TIME *in;
+
+    if (x == NULL)
+        return (0);
+    in = x->crl.lastUpdate;
+    if (in != tm) {
+        in = ASN1_STRING_dup(tm);
+        if (in != NULL) {
+            ASN1_TIME_free(x->crl.lastUpdate);
+            x->crl.lastUpdate = in;
+        }
+    }
+    return (in != NULL);
+}
+
+int X509_CRL_set_nextUpdate(X509_CRL *x, const ASN1_TIME *tm)
+{
+    ASN1_TIME *in;
+
+    if (x == NULL)
+        return (0);
+    in = x->crl.nextUpdate;
+    if (in != tm) {
+        in = ASN1_STRING_dup(tm);
+        if (in != NULL) {
+            ASN1_TIME_free(x->crl.nextUpdate);
+            x->crl.nextUpdate = in;
+        }
+    }
+    return (in != NULL);
+}
 
 int X509_CRL_sort(X509_CRL *c)
-       {
-       int i;
-       X509_REVOKED *r;
-       /* sort the data so it will be written in serial
-        * number order */
-       sk_X509_REVOKED_sort(c->crl->revoked);
-       for (i=0; i<sk_X509_REVOKED_num(c->crl->revoked); i++)
-               {
-               r=sk_X509_REVOKED_value(c->crl->revoked,i);
-               r->sequence=i;
-               }
-       return 1;
-       }
+{
+    int i;
+    X509_REVOKED *r;
+    /*
+     * sort the data so it will be written in serial number order
+     */
+    sk_X509_REVOKED_sort(c->crl.revoked);
+    for (i = 0; i < sk_X509_REVOKED_num(c->crl.revoked); i++) {
+        r = sk_X509_REVOKED_value(c->crl.revoked, i);
+        r->sequence = i;
+    }
+    c->crl.enc.modified = 1;
+    return 1;
+}
+
+void X509_CRL_up_ref(X509_CRL *crl)
+{
+    CRYPTO_add(&crl->references, 1, CRYPTO_LOCK_X509_CRL);
+}
+
+long X509_CRL_get_version(X509_CRL *crl)
+{
+    return ASN1_INTEGER_get(crl->crl.version);
+}
+
+ASN1_TIME *X509_CRL_get_lastUpdate(X509_CRL *crl)
+{
+    return crl->crl.lastUpdate;
+}
+
+ASN1_TIME *X509_CRL_get_nextUpdate(X509_CRL *crl)
+{
+    return crl->crl.nextUpdate;
+}
+
+X509_NAME *X509_CRL_get_issuer(X509_CRL *crl)
+{
+    return crl->crl.issuer;
+}
+
+STACK_OF(X509_REVOKED) *X509_CRL_get_REVOKED(X509_CRL *crl)
+{
+    return crl->crl.revoked;
+}
+
+void X509_CRL_get0_signature(ASN1_BIT_STRING **psig, X509_ALGOR **palg,
+                             X509_CRL *crl)
+{
+    if (psig == NULL)
+        *psig = crl->signature;
+    if (palg == NULL)
+        *palg = &crl->sig_alg;
+}
+
+int X509_CRL_get_signature_nid(const X509_CRL *crl)
+{
+    return OBJ_obj2nid(crl->sig_alg.algorithm);
+}
 
 int X509_REVOKED_set_revocationDate(X509_REVOKED *x, ASN1_TIME *tm)
-       {
-       ASN1_TIME *in;
-
-       if (x == NULL) return(0);
-       in=x->revocationDate;
-       if (in != tm)
-               {
-               in=M_ASN1_TIME_dup(tm);
-               if (in != NULL)
-                       {
-                       M_ASN1_TIME_free(x->revocationDate);
-                       x->revocationDate=in;
-                       }
-               }
-       return(in != NULL);
-       }
+{
+    ASN1_TIME *in;
+
+    if (x == NULL)
+        return (0);
+    in = x->revocationDate;
+    if (in != tm) {
+        in = ASN1_STRING_dup(tm);
+        if (in != NULL) {
+            ASN1_TIME_free(x->revocationDate);
+            x->revocationDate = in;
+        }
+    }
+    return (in != NULL);
+}
 
 int X509_REVOKED_set_serialNumber(X509_REVOKED *x, ASN1_INTEGER *serial)
-       {
-       ASN1_INTEGER *in;
-
-       if (x == NULL) return(0);
-       in=x->serialNumber;
-       if (in != serial)
-               {
-               in=M_ASN1_INTEGER_dup(serial);
-               if (in != NULL)
-                       {
-                       M_ASN1_INTEGER_free(x->serialNumber);
-                       x->serialNumber=in;
-                       }
-               }
-       return(in != NULL);
-       }
+{
+    ASN1_INTEGER *in;
+
+    if (x == NULL)
+        return (0);
+    in = x->serialNumber;
+    if (in != serial) {
+        in = ASN1_INTEGER_dup(serial);
+        if (in != NULL) {
+            ASN1_INTEGER_free(x->serialNumber);
+            x->serialNumber = in;
+        }
+    }
+    return (in != NULL);
+}
+
+int i2d_re_X509_CRL_tbs(X509_CRL *crl, unsigned char **pp)
+{
+    crl->crl.enc.modified = 1;
+    return i2d_X509_CRL_INFO(&crl->crl, pp);
+}