Fix some X509_STORE macros

[openssl.git] / crypto / ts / ts_req_print.c

diff --git a/crypto/ts/ts_req_print.c b/crypto/ts/ts_req_print.c
index 8827f20d6599168cfa43e91b12ae4568f51ce258..791715cce86d34edecacd3dd4f91e9af1d0ba417 100644 (file)
--- a/crypto/ts/ts_req_print.c
+++ b/crypto/ts/ts_req_print.c
@@ -1,6 +1,6 @@
-/* crypto/ts/ts_req_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 +10,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
@@ -57,46 +57,44 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/bn.h>
 #include <openssl/x509v3.h>
 #include <openssl/ts.h>
-
-/* Function definitions. */
+#include "ts_lcl.h"
 
 int TS_REQ_print_bio(BIO *bio, TS_REQ *a)
-       {
-       int v;
-       ASN1_OBJECT *policy_id;
-       ASN1_INTEGER *nonce;
+{
+    int v;
+    ASN1_OBJECT *policy_id;
 
-       if (a == NULL) return 0;
+    if (a == NULL)
+        return 0;
 
-       v = TS_REQ_get_version(a);
-       BIO_printf(bio, "Version: %d\n", v);
+    v = TS_REQ_get_version(a);
+    BIO_printf(bio, "Version: %d\n", v);
 
-       TS_MSG_IMPRINT_print_bio(bio, TS_REQ_get_msg_imprint(a));
+    TS_MSG_IMPRINT_print_bio(bio, a->msg_imprint);
 
-       BIO_printf(bio, "Policy OID: ");
-       policy_id = TS_REQ_get_policy_id(a);
-       if (policy_id == NULL)
-               BIO_printf(bio, "unspecified\n");
-       else    
-               TS_OBJ_print_bio(bio, policy_id);
+    BIO_printf(bio, "Policy OID: ");
+    policy_id = TS_REQ_get_policy_id(a);
+    if (policy_id == NULL)
+        BIO_printf(bio, "unspecified\n");
+    else
+        TS_OBJ_print_bio(bio, policy_id);
 
-       BIO_printf(bio, "Nonce: ");
-       nonce = TS_REQ_get_nonce(a);
-       if (nonce == NULL)
-               BIO_printf(bio, "unspecified");
-       else
-               TS_ASN1_INTEGER_print_bio(bio, nonce);
-       BIO_write(bio, "\n", 1);
+    BIO_printf(bio, "Nonce: ");
+    if (a->nonce == NULL)
+        BIO_printf(bio, "unspecified");
+    else
+        TS_ASN1_INTEGER_print_bio(bio, a->nonce);
+    BIO_write(bio, "\n", 1);
 
-       BIO_printf(bio, "Certificate required: %s\n", 
-                  TS_REQ_get_cert_req(a) ? "yes" : "no");
+    BIO_printf(bio, "Certificate required: %s\n",
+               a->cert_req ? "yes" : "no");
 
-       TS_ext_print_bio(bio, TS_REQ_get_exts(a));
+    TS_ext_print_bio(bio, a->extensions);
 
-       return 1;
-       }
+    return 1;
+}