Reformat smime utility.

[openssl.git] / apps / apps.c

diff --git a/apps/apps.c b/apps/apps.c
index fa2f8a2b85352180420d56aea30f7388090b9e52..4121e47e9d6c7390c7c92870ba3c2b92d42e170b 100644 (file)
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -125,6 +125,8 @@
 #ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
 #endif
+#include <openssl/rsa.h>
+#include <openssl/bn.h>
 
 #define NON_MAIN
 #include "apps.h"
@@ -1433,12 +1435,9 @@ BIGNUM *load_serial(char *serialfile, int create, ASN1_INTEGER **retai)
                        }
                else
                        {
-                       ASN1_INTEGER_set(ai,1);
                        ret=BN_new();
-                       if (ret == NULL)
+                       if (ret == NULL || !rand_serial(ret, ai))
                                BIO_printf(bio_err, "Out of memory\n");
-                       else
-                               BN_one(ret);
                        }
                }
        else
@@ -1600,6 +1599,33 @@ int rotate_serial(char *serialfile, char *new_suffix, char *old_suffix)
        return 0;
        }
 
+int rand_serial(BIGNUM *b, ASN1_INTEGER *ai)
+       {
+       BIGNUM *btmp;
+       int ret = 0;
+       if (b)
+               btmp = b;
+       else
+               btmp = BN_new();
+
+       if (!btmp)
+               return 0;
+
+       if (!BN_pseudo_rand(btmp, SERIAL_RAND_BITS, 0, 0))
+               goto error;
+       if (ai && !BN_to_ASN1_INTEGER(btmp, ai))
+               goto error;
+
+       ret = 1;
+       
+       error:
+
+       if (!b)
+               BN_free(btmp);
+       
+       return ret;
+       }
+
 CA_DB *load_index(char *dbfile, DB_ATTR *db_attr)
        {
        CA_DB *retdb = NULL;
@@ -2114,3 +2140,141 @@ int WIN32_rename(char *from, char *to)
 #endif
        }
 #endif
+
+int args_verify(char ***pargs, int *pargc,
+                       int *badarg, BIO *err, X509_VERIFY_PARAM **pm)
+       {
+       ASN1_OBJECT *otmp = NULL;
+       unsigned long flags = 0;
+       int i;
+       int purpose = 0;
+       char **oldargs = *pargs;
+       char *arg = **pargs, *argn = (*pargs)[1];
+       if (!strcmp(arg, "-policy"))
+               {
+               if (!argn)
+                       *badarg = 1;
+               else
+                       {
+                       otmp = OBJ_txt2obj(argn, 0);
+                       if (!otmp)
+                               {
+                               BIO_printf(err, "Invalid Policy \"%s\"\n",
+                                                                       argn);
+                               *badarg = 1;
+                               }
+                       }
+               (*pargs)++;
+               }
+       else if (strcmp(arg,"-purpose") == 0)
+               {
+               X509_PURPOSE *xptmp;
+               if (!argn)
+                       *badarg = 1;
+               else
+                       {
+                       i = X509_PURPOSE_get_by_sname(argn);
+                       if(i < 0)
+                               {
+                               BIO_printf(err, "unrecognized purpose\n");
+                               *badarg = 1;
+                               }
+                       else
+                               {
+                               xptmp = X509_PURPOSE_get0(i);
+                               purpose = X509_PURPOSE_get_id(xptmp);
+                               }
+                       }
+               (*pargs)++;
+               }
+       else if (!strcmp(arg, "-ignore_critical"))
+               flags |= X509_V_FLAG_IGNORE_CRITICAL;
+       else if (!strcmp(arg, "-issuer_checks"))
+               flags |= X509_V_FLAG_CB_ISSUER_CHECK;
+       else if (!strcmp(arg, "-crl_check"))
+               flags |=  X509_V_FLAG_CRL_CHECK;
+       else if (!strcmp(arg, "-crl_check_all"))
+               flags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
+       else if (!strcmp(arg, "-policy_check"))
+               flags |= X509_V_FLAG_POLICY_CHECK;
+       else if (!strcmp(arg, "-explicit_policy"))
+               flags |= X509_V_FLAG_EXPLICIT_POLICY;
+       else if (!strcmp(arg, "-x509_strict"))
+               flags |= X509_V_FLAG_X509_STRICT;
+       else if (!strcmp(arg, "-policy_print"))
+               flags |= X509_V_FLAG_NOTIFY_POLICY;
+       else
+               return 0;
+
+       if (*badarg)
+               {
+               if (*pm)
+                       X509_VERIFY_PARAM_free(*pm);
+               *pm = NULL;
+               goto end;
+               }
+
+       if (!*pm && !(*pm = X509_VERIFY_PARAM_new()))
+               {
+               *badarg = 1;
+               goto end;
+               }
+
+       if (otmp)
+               X509_VERIFY_PARAM_add0_policy(*pm, otmp);
+       if (flags)
+               X509_VERIFY_PARAM_set_flags(*pm, flags);
+
+       if (purpose)
+               X509_VERIFY_PARAM_set_purpose(*pm, purpose);
+
+       end:
+
+       (*pargs)++;
+
+       if (pargc)
+               *pargc -= *pargs - oldargs;
+
+       return 1;
+
+       }
+
+static void nodes_print(BIO *out, char *name, STACK_OF(X509_POLICY_NODE) *nodes)
+       {
+       X509_POLICY_NODE *node;
+       int i;
+       BIO_printf(out, "%s Policies:", name);
+       if (nodes)
+               {
+               BIO_puts(out, "\n");
+               for (i = 0; i < sk_X509_POLICY_NODE_num(nodes); i++)
+                       {
+                       node = sk_X509_POLICY_NODE_value(nodes, i);
+                       X509_POLICY_NODE_print(out, node, 2);
+                       }
+               }
+       else
+               BIO_puts(out, " <empty>\n");
+       }
+
+void policies_print(BIO *out, X509_STORE_CTX *ctx)
+       {
+       X509_POLICY_TREE *tree;
+       int explicit_policy;
+       int free_out = 0;
+       if (out == NULL)
+               {
+               out = BIO_new_fp(stderr, BIO_NOCLOSE);
+               free_out = 1;
+               }
+       tree = X509_STORE_CTX_get0_policy_tree(ctx);
+       explicit_policy = X509_STORE_CTX_get_explicit_policy(ctx);
+
+       BIO_printf(out, "Require explicit Policy: %s\n",
+                               explicit_policy ? "True" : "False");
+
+       nodes_print(out, "Authority", X509_policy_tree_get0_policies(tree));
+       nodes_print(out, "User", X509_policy_tree_get0_user_policies(tree));
+       if (free_out)
+               BIO_free(out);
+       }