CRYPTO_128_unwrap(): Fix refactoring damage
[openssl.git] / crypto / ts / ts_rsp_print.c
index 6421315e41b30b04aefd95d814ac48858b9c5213..d64f2f4e4a46f4b7d97f0f84580a0a27c39db785 100644 (file)
@@ -1,6 +1,7 @@
 /* crypto/ts/ts_resp_print.c */
-/* Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL
- * project 2002.
+/*
+ * Written by Zoltan Glozik (zglozik@stones.com) for the OpenSSL project
+ * 2002.
  */
 /* ====================================================================
  * Copyright (c) 2006 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 <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
-#include "ts.h"
+#include <openssl/ts.h>
 
-struct status_map_st
-       {
-       int bit;
-       const char *text;
-       };
+struct status_map_st {
+    int bit;
+    const char *text;
+};
 
 /* Local function declarations. */
 
-static int TS_status_map_print(BIO *bio, struct status_map_st *a,
-                              ASN1_BIT_STRING *v);
-static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy);
+static int TS_status_map_print(BIO *bio, const struct status_map_st *a,
+                               const ASN1_BIT_STRING *v);
+static int TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy);
 
 /* Function definitions. */
 
 int TS_RESP_print_bio(BIO *bio, TS_RESP *a)
-       {
-       TS_TST_INFO *tst_info;
-
-       BIO_printf(bio, "Status info:\n");
-       TS_STATUS_INFO_print_bio(bio, TS_RESP_get_status_info(a));
-
-       BIO_printf(bio, "\nTST info:\n");
-       tst_info = TS_RESP_get_tst_info(a);
-       if (tst_info != NULL)
-               TS_TST_INFO_print_bio(bio, TS_RESP_get_tst_info(a));
-       else
-               BIO_printf(bio, "Not included.\n");
-               
-       return 1;
-       }
+{
+    TS_TST_INFO *tst_info;
+
+    BIO_printf(bio, "Status info:\n");
+    TS_STATUS_INFO_print_bio(bio, TS_RESP_get_status_info(a));
+
+    BIO_printf(bio, "\nTST info:\n");
+    tst_info = TS_RESP_get_tst_info(a);
+    if (tst_info != NULL)
+        TS_TST_INFO_print_bio(bio, TS_RESP_get_tst_info(a));
+    else
+        BIO_printf(bio, "Not included.\n");
+
+    return 1;
+}
 
 int TS_STATUS_INFO_print_bio(BIO *bio, TS_STATUS_INFO *a)
-       {
-       static const char *status_map[] =
-               {
-               "Granted.",
-               "Granted with modifications.",
-               "Rejected.",
-               "Waiting.",
-               "Revocation warning.",
-               "Revoked."
-               };
-       static struct status_map_st failure_map[] =
-               {
-               { TS_INFO_BAD_ALG,
-               "unrecognized or unsupported algorithm identifier" },
-               { TS_INFO_BAD_REQUEST,
-               "transaction not permitted or supported" },
-               { TS_INFO_BAD_DATA_FORMAT,
-               "the data submitted has the wrong format" },
-               { TS_INFO_TIME_NOT_AVAILABLE,
-               "the TSA's time source is not available" },
-               { TS_INFO_UNACCEPTED_POLICY,
-               "the requested TSA policy is not supported by the TSA" },
-               { TS_INFO_UNACCEPTED_EXTENSION,
-               "the requested extension is not supported by the TSA" },
-               { TS_INFO_ADD_INFO_NOT_AVAILABLE,
-               "the additional information requested could not be understood "
-               "or is not available" },
-               { TS_INFO_SYSTEM_FAILURE,
-               "the request cannot be handled due to system failure" },
-               { -1, NULL }
-               };
-       long status;
-       int i, lines = 0;
-
-       /* Printing status code. */
-       BIO_printf(bio, "Status: ");
-       status = ASN1_INTEGER_get(a->status);
-       if (0 <= status && status < (long)(sizeof(status_map)/sizeof(status_map[0])))
-               BIO_printf(bio, "%s\n", status_map[status]);
-       else
-               BIO_printf(bio, "out of bounds\n");
-       
-       /* Printing status description. */
-       BIO_printf(bio, "Status description: ");
-       for (i = 0; i < sk_ASN1_UTF8STRING_num(a->text); ++i)
-               {
-               if (i > 0)
-                       BIO_puts(bio, "\t");
-               ASN1_STRING_print_ex(bio, sk_ASN1_UTF8STRING_value(a->text, i),
-                                    0);
-               BIO_puts(bio, "\n");
-               }
-       if (i == 0)
-               BIO_printf(bio, "unspecified\n");
-
-       /* Printing failure information. */
-       BIO_printf(bio, "Failure info: ");
-       if (a->failure_info != NULL)
-               lines = TS_status_map_print(bio, failure_map,
-                                           a->failure_info);
-       if (lines == 0)
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, "\n");
-
-       return 1;
-       }
-
-static int TS_status_map_print(BIO *bio, struct status_map_st *a,
-                              ASN1_BIT_STRING *v)
-       {
-       int lines = 0;
-
-       for (; a->bit >= 0; ++a)
-               {
-               if (ASN1_BIT_STRING_get_bit(v, a->bit))
-                       {
-                       if (++lines > 1)
-                               BIO_printf(bio, ", ");
-                       BIO_printf(bio, "%s", a->text);
-                       }
-               }
-
-       return lines;
-       }
+{
+    static const char *status_map[] = {
+        "Granted.",
+        "Granted with modifications.",
+        "Rejected.",
+        "Waiting.",
+        "Revocation warning.",
+        "Revoked."
+    };
+    static const struct status_map_st failure_map[] = {
+        {TS_INFO_BAD_ALG,
+         "unrecognized or unsupported algorithm identifier"},
+        {TS_INFO_BAD_REQUEST,
+         "transaction not permitted or supported"},
+        {TS_INFO_BAD_DATA_FORMAT,
+         "the data submitted has the wrong format"},
+        {TS_INFO_TIME_NOT_AVAILABLE,
+         "the TSA's time source is not available"},
+        {TS_INFO_UNACCEPTED_POLICY,
+         "the requested TSA policy is not supported by the TSA"},
+        {TS_INFO_UNACCEPTED_EXTENSION,
+         "the requested extension is not supported by the TSA"},
+        {TS_INFO_ADD_INFO_NOT_AVAILABLE,
+         "the additional information requested could not be understood "
+         "or is not available"},
+        {TS_INFO_SYSTEM_FAILURE,
+         "the request cannot be handled due to system failure"},
+        {-1, NULL}
+    };
+    long status;
+    int i, lines = 0;
+
+    /* Printing status code. */
+    BIO_printf(bio, "Status: ");
+    status = ASN1_INTEGER_get(a->status);
+    if (0 <= status
+        && status < (long)(sizeof(status_map) / sizeof(status_map[0])))
+        BIO_printf(bio, "%s\n", status_map[status]);
+    else
+        BIO_printf(bio, "out of bounds\n");
+
+    /* Printing status description. */
+    BIO_printf(bio, "Status description: ");
+    for (i = 0; i < sk_ASN1_UTF8STRING_num(a->text); ++i) {
+        if (i > 0)
+            BIO_puts(bio, "\t");
+        ASN1_STRING_print_ex(bio, sk_ASN1_UTF8STRING_value(a->text, i), 0);
+        BIO_puts(bio, "\n");
+    }
+    if (i == 0)
+        BIO_printf(bio, "unspecified\n");
+
+    /* Printing failure information. */
+    BIO_printf(bio, "Failure info: ");
+    if (a->failure_info != NULL)
+        lines = TS_status_map_print(bio, failure_map, a->failure_info);
+    if (lines == 0)
+        BIO_printf(bio, "unspecified");
+    BIO_printf(bio, "\n");
+
+    return 1;
+}
+
+static int TS_status_map_print(BIO *bio, const struct status_map_st *a,
+                               const ASN1_BIT_STRING *v)
+{
+    int lines = 0;
+
+    for (; a->bit >= 0; ++a) {
+        if (ASN1_BIT_STRING_get_bit(v, a->bit)) {
+            if (++lines > 1)
+                BIO_printf(bio, ", ");
+            BIO_printf(bio, "%s", a->text);
+        }
+    }
+
+    return lines;
+}
 
 int TS_TST_INFO_print_bio(BIO *bio, TS_TST_INFO *a)
-       {
-       int v;
-       ASN1_OBJECT *policy_id;
-       ASN1_INTEGER *serial;
-       ASN1_GENERALIZEDTIME *gtime;
-       TS_ACCURACY *accuracy;
-       ASN1_INTEGER *nonce;
-       GENERAL_NAME *tsa_name;
-
-       if (a == NULL) return 0;
-
-       /* Print version. */
-       v = TS_TST_INFO_get_version(a);
-       BIO_printf(bio, "Version: %d\n", v);
-
-       /* Print policy id. */
-       BIO_printf(bio, "Policy OID: ");
-       policy_id = TS_TST_INFO_get_policy_id(a);
-       TS_OBJ_print_bio(bio, policy_id);
-
-       /* Print message imprint. */
-       TS_MSG_IMPRINT_print_bio(bio, TS_TST_INFO_get_msg_imprint(a));
-
-       /* Print serial number. */
-       BIO_printf(bio, "Serial number: ");
-       serial = TS_TST_INFO_get_serial(a);
-       if (serial == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ASN1_INTEGER_print_bio(bio, serial);
-       BIO_write(bio, "\n", 1);
-
-       /* Print time stamp. */
-       BIO_printf(bio, "Time stamp: ");
-       gtime = TS_TST_INFO_get_time(a);
-       ASN1_GENERALIZEDTIME_print(bio, gtime);
-       BIO_write(bio, "\n", 1);
-
-       /* Print accuracy. */
-       BIO_printf(bio, "Accuracy: ");
-       accuracy = TS_TST_INFO_get_accuracy(a);
-       if (accuracy == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ACCURACY_print_bio(bio, accuracy);
-       BIO_write(bio, "\n", 1);
-
-       /* Print ordering. */
-       BIO_printf(bio, "Ordering: %s\n", 
-                  TS_TST_INFO_get_ordering(a) ? "yes" : "no");
-
-       /* Print nonce. */
-       BIO_printf(bio, "Nonce: ");
-       nonce = TS_TST_INFO_get_nonce(a);
-       if (nonce == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ASN1_INTEGER_print_bio(bio, nonce);
-       BIO_write(bio, "\n", 1);
-
-       /* Print TSA name. */
-       BIO_printf(bio, "TSA: ");
-       tsa_name = TS_TST_INFO_get_tsa(a);
-       if (tsa_name == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               {
-               STACK_OF(CONF_VALUE) *nval;
-               if ((nval = i2v_GENERAL_NAME(NULL, tsa_name, NULL)))
-                       X509V3_EXT_val_prn(bio, nval, 0, 0);
-               sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
-               }
-       BIO_write(bio, "\n", 1);
-
-       /* Print extensions. */
-       TS_ext_print_bio(bio, TS_TST_INFO_get_exts(a));
-
-       return 1;
-       }
-
-static int TS_ACCURACY_print_bio(BIO *bio, TS_ACCURACY *accuracy)
-       {
-       ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy);
-       ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy);
-       ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy);
-
-       if (seconds != NULL)
-               TS_ASN1_INTEGER_print_bio(bio, seconds);
-       else
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, " seconds, ");
-       if (millis != NULL)
-               TS_ASN1_INTEGER_print_bio(bio, millis);
-       else
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, " millis, ");
-       if (micros != NULL)
-               TS_ASN1_INTEGER_print_bio(bio, micros);
-       else
-               BIO_printf(bio, "unspecified");
-       BIO_printf(bio, " micros");
-
-       return 1;
-       }
+{
+    int v;
+    ASN1_OBJECT *policy_id;
+    const ASN1_INTEGER *serial;
+    const ASN1_GENERALIZEDTIME *gtime;
+    TS_ACCURACY *accuracy;
+    const ASN1_INTEGER *nonce;
+    GENERAL_NAME *tsa_name;
+
+    if (a == NULL)
+        return 0;
+
+    /* Print version. */
+    v = TS_TST_INFO_get_version(a);
+    BIO_printf(bio, "Version: %d\n", v);
+
+    /* Print policy id. */
+    BIO_printf(bio, "Policy OID: ");
+    policy_id = TS_TST_INFO_get_policy_id(a);
+    TS_OBJ_print_bio(bio, policy_id);
+
+    /* Print message imprint. */
+    TS_MSG_IMPRINT_print_bio(bio, TS_TST_INFO_get_msg_imprint(a));
+
+    /* Print serial number. */
+    BIO_printf(bio, "Serial number: ");
+    serial = TS_TST_INFO_get_serial(a);
+    if (serial == NULL)
+        BIO_printf(bio, "unspecified");
+    else
+        TS_ASN1_INTEGER_print_bio(bio, serial);
+    BIO_write(bio, "\n", 1);
+
+    /* Print time stamp. */
+    BIO_printf(bio, "Time stamp: ");
+    gtime = TS_TST_INFO_get_time(a);
+    ASN1_GENERALIZEDTIME_print(bio, gtime);
+    BIO_write(bio, "\n", 1);
+
+    /* Print accuracy. */
+    BIO_printf(bio, "Accuracy: ");
+    accuracy = TS_TST_INFO_get_accuracy(a);
+    if (accuracy == NULL)
+        BIO_printf(bio, "unspecified");
+    else
+        TS_ACCURACY_print_bio(bio, accuracy);
+    BIO_write(bio, "\n", 1);
+
+    /* Print ordering. */
+    BIO_printf(bio, "Ordering: %s\n",
+               TS_TST_INFO_get_ordering(a) ? "yes" : "no");
+
+    /* Print nonce. */
+    BIO_printf(bio, "Nonce: ");
+    nonce = TS_TST_INFO_get_nonce(a);
+    if (nonce == NULL)
+        BIO_printf(bio, "unspecified");
+    else
+        TS_ASN1_INTEGER_print_bio(bio, nonce);
+    BIO_write(bio, "\n", 1);
+
+    /* Print TSA name. */
+    BIO_printf(bio, "TSA: ");
+    tsa_name = TS_TST_INFO_get_tsa(a);
+    if (tsa_name == NULL)
+        BIO_printf(bio, "unspecified");
+    else {
+        STACK_OF(CONF_VALUE) *nval;
+        if ((nval = i2v_GENERAL_NAME(NULL, tsa_name, NULL)))
+            X509V3_EXT_val_prn(bio, nval, 0, 0);
+        sk_CONF_VALUE_pop_free(nval, X509V3_conf_free);
+    }
+    BIO_write(bio, "\n", 1);
+
+    /* Print extensions. */
+    TS_ext_print_bio(bio, TS_TST_INFO_get_exts(a));
+
+    return 1;
+}
+
+static int TS_ACCURACY_print_bio(BIO *bio, const TS_ACCURACY *accuracy)
+{
+    const ASN1_INTEGER *seconds = TS_ACCURACY_get_seconds(accuracy);
+    const ASN1_INTEGER *millis = TS_ACCURACY_get_millis(accuracy);
+    const ASN1_INTEGER *micros = TS_ACCURACY_get_micros(accuracy);
+
+    if (seconds != NULL)
+        TS_ASN1_INTEGER_print_bio(bio, seconds);
+    else
+        BIO_printf(bio, "unspecified");
+    BIO_printf(bio, " seconds, ");
+    if (millis != NULL)
+        TS_ASN1_INTEGER_print_bio(bio, millis);
+    else
+        BIO_printf(bio, "unspecified");
+    BIO_printf(bio, " millis, ");
+    if (micros != NULL)
+        TS_ASN1_INTEGER_print_bio(bio, micros);
+    else
+        BIO_printf(bio, "unspecified");
+    BIO_printf(bio, " micros");
+
+    return 1;
+}