Add additional DigestInfo checks.

[openssl.git] / crypto / asn1 / asn_moid.c

diff --git a/crypto/asn1/asn_moid.c b/crypto/asn1/asn_moid.c
index e27b7affc26739834d70ddf2cdd850dcef196262..1ea6a5924838bcfd702153472a916d7941338eb7 100644 (file)
--- a/crypto/asn1/asn_moid.c
+++ b/crypto/asn1/asn_moid.c
@@ -1,9 +1,9 @@
 /* asn_moid.c */
-/* Written by Stephen Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL
  * 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
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <ctype.h>
 #include <openssl/crypto.h>
 #include "cryptlib.h"
 #include <openssl/conf.h>
@@ -65,21 +66,95 @@
 
 /* Simple ASN1 OID module: add all objects in a given section */
 
-/* NOTE: doesn't do anything other than print debug messages yet... */
-static int oid_module_init(CONF_IMODULE *md, CONF *cnf)
+static int do_create(char *value, char *name);
+
+static int oid_module_init(CONF_IMODULE *md, const CONF *cnf)
        {
-       fprintf(stderr, "Called oid_module_init: name %s, value %s\n",
-                       CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+       int i;
+       const char *oid_section;
+       STACK_OF(CONF_VALUE) *sktmp;
+       CONF_VALUE *oval;
+       oid_section = CONF_imodule_get_value(md);
+       if(!(sktmp = NCONF_get_section(cnf, oid_section)))
+               {
+               ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ERROR_LOADING_SECTION);
+               return 0;
+               }
+       for(i = 0; i < sk_CONF_VALUE_num(sktmp); i++)
+               {
+               oval = sk_CONF_VALUE_value(sktmp, i);
+               if(!do_create(oval->value, oval->name))
+                       {
+                       ASN1err(ASN1_F_OID_MODULE_INIT, ASN1_R_ADDING_OBJECT);
+                       return 0;
+                       }
+               }
        return 1;
        }
 
 static void oid_module_finish(CONF_IMODULE *md)
        {
-       fprintf(stderr, "Called oid_module_finish: name %s, value %s\n",
-                       CONF_imodule_get_name(md), CONF_imodule_get_value(md));
+       OBJ_cleanup();
        }
 
 void ASN1_add_oid_module(void)
        {
        CONF_module_add("oid_section", oid_module_init, oid_module_finish);
        }
+
+/* Create an OID based on a name value pair. Accept two formats.
+ * shortname = 1.2.3.4
+ * shortname = some long name, 1.2.3.4
+ */
+
+
+static int do_create(char *value, char *name)
+       {
+       int nid;
+       ASN1_OBJECT *oid;
+       char *ln, *ostr, *p, *lntmp;
+       p = strrchr(value, ',');
+       if (!p)
+               {
+               ln = name;
+               ostr = value;
+               }
+       else
+               {
+               ln = NULL;
+               ostr = p + 1;
+               if (!*ostr)
+                       return 0;
+               while(isspace((unsigned char)*ostr)) ostr++;
+               }
+
+       nid = OBJ_create(ostr, name, ln);
+
+       if (nid == NID_undef)
+               return 0;
+
+       if (p)
+               {
+               ln = value;
+               while(isspace((unsigned char)*ln)) ln++;
+               p--;
+               while(isspace((unsigned char)*p))
+                       {
+                       if (p == ln)
+                               return 0;
+                       p--;
+                       }
+               p++;
+               lntmp = OPENSSL_malloc((p - ln) + 1);
+               if (lntmp == NULL)
+                       return 0;
+               memcpy(lntmp, ln, p - ln);
+               lntmp[p - ln] = 0;
+               oid = OBJ_nid2obj(nid);
+               oid->ln = lntmp;
+               }
+
+       return 1;
+       }
+               
+