Continue standardising malloc style for libcrypto

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

diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index a2ef4a4d9a29e064a3e284198f68191bf3b9ab3b..fb871d2a0fffe7e5a6c2ea70e6eeb583f18f98f1 100644 (file)
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -1,6 +1,7 @@
 /* crypto/ts/ts_lib.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
@@ -57,89 +58,86 @@
  */
 
 #include <stdio.h>
-#include "cryptlib.h"
+#include "internal/cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/bn.h>
+#include <openssl/x509.h>
 #include <openssl/x509v3.h>
-#include "ts.h"
-
-/* Local function declarations. */
-
-/* Function definitions. */
-
-int TS_ASN1_INTEGER_print_bio(BIO *bio, ASN1_INTEGER *num)
-       {
-       BIGNUM num_bn;
-       int result = 0;
-       char *hex;
-
-       BN_init(&num_bn);
-       ASN1_INTEGER_to_BN(num, &num_bn);
-       if ((hex = BN_bn2hex(&num_bn))) 
-               {
-               result = BIO_write(bio, "0x", 2) > 0;
-               result = result && BIO_write(bio, hex, strlen(hex)) > 0;
-               OPENSSL_free(hex);
-               }
-       BN_free(&num_bn);
-
-       return result;
-       }
-
-int TS_OBJ_print_bio(BIO *bio, ASN1_OBJECT *obj)
-       {
-       char obj_txt[128];
-
-       int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
-       BIO_write(bio, obj_txt, len);
-       BIO_write(bio, "\n", 1);
-
-       return 1;
-       }
-
-int TS_ext_print_bio(BIO *bio, STACK_OF(X509_EXTENSION) *extensions)
-       {
-       int i, critical, n;
-       X509_EXTENSION *ex;
-       ASN1_OBJECT *obj;
-
-       BIO_printf(bio, "Extensions:\n");
-       n = X509v3_get_ext_count(extensions);
-       for (i = 0; i < n; i++)
-               {
-               ex = X509v3_get_ext(extensions, i);
-               obj = X509_EXTENSION_get_object(ex);
-               i2a_ASN1_OBJECT(bio, obj);
-               critical = X509_EXTENSION_get_critical(ex);
-               BIO_printf(bio, ": %s\n", critical ? "critical" : "");
-               if (!X509V3_EXT_print(bio, ex, 0, 4))
-                       {
-                       BIO_printf(bio, "%4s", "");
-                       M_ASN1_OCTET_STRING_print(bio, ex->value);
-                       }
-               BIO_write(bio, "\n", 1);
-               }
-
-       return 1;
-       }
-
-int TS_X509_ALGOR_print_bio(BIO *bio, X509_ALGOR *alg)
-       {
-       int i = OBJ_obj2nid(alg->algorithm);
-       return BIO_printf(bio, "Hash Algorithm: %s\n",
-               (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
-       }
+#include <openssl/ts.h>
+#include "ts_lcl.h"
+
+int TS_ASN1_INTEGER_print_bio(BIO *bio, const ASN1_INTEGER *num)
+{
+    BIGNUM *num_bn;
+    int result = 0;
+    char *hex;
+
+    num_bn = BN_new();
+    if (num_bn == NULL)
+        return -1;
+    ASN1_INTEGER_to_BN(num, num_bn);
+    if ((hex = BN_bn2hex(num_bn))) {
+        result = BIO_write(bio, "0x", 2) > 0;
+        result = result && BIO_write(bio, hex, strlen(hex)) > 0;
+        OPENSSL_free(hex);
+    }
+    BN_free(num_bn);
+
+    return result;
+}
+
+int TS_OBJ_print_bio(BIO *bio, const ASN1_OBJECT *obj)
+{
+    char obj_txt[128];
+
+    int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
+    BIO_write(bio, obj_txt, len);
+    BIO_write(bio, "\n", 1);
+
+    return 1;
+}
+
+int TS_ext_print_bio(BIO *bio, const STACK_OF(X509_EXTENSION) *extensions)
+{
+    int i, critical, n;
+    X509_EXTENSION *ex;
+    ASN1_OBJECT *obj;
+
+    BIO_printf(bio, "Extensions:\n");
+    n = X509v3_get_ext_count(extensions);
+    for (i = 0; i < n; i++) {
+        ex = X509v3_get_ext(extensions, i);
+        obj = X509_EXTENSION_get_object(ex);
+        i2a_ASN1_OBJECT(bio, obj);
+        critical = X509_EXTENSION_get_critical(ex);
+        BIO_printf(bio, ": %s\n", critical ? "critical" : "");
+        if (!X509V3_EXT_print(bio, ex, 0, 4)) {
+            BIO_printf(bio, "%4s", "");
+            ASN1_STRING_print(bio, X509_EXTENSION_get_data(ex));
+        }
+        BIO_write(bio, "\n", 1);
+    }
+
+    return 1;
+}
+
+int TS_X509_ALGOR_print_bio(BIO *bio, const X509_ALGOR *alg)
+{
+    int i = OBJ_obj2nid(alg->algorithm);
+    return BIO_printf(bio, "Hash Algorithm: %s\n",
+                      (i == NID_undef) ? "UNKNOWN" : OBJ_nid2ln(i));
+}
 
 int TS_MSG_IMPRINT_print_bio(BIO *bio, TS_MSG_IMPRINT *a)
-       {
-       ASN1_OCTET_STRING *msg;
+{
+    ASN1_OCTET_STRING *msg;
 
-       TS_X509_ALGOR_print_bio(bio, TS_MSG_IMPRINT_get_algo(a));
+    TS_X509_ALGOR_print_bio(bio, a->hash_algo);
 
-       BIO_printf(bio, "Message data:\n");
-       msg = TS_MSG_IMPRINT_get_msg(a);
-       BIO_dump_indent(bio, (const char *)M_ASN1_STRING_data(msg), 
-                       M_ASN1_STRING_length(msg), 4);
+    BIO_printf(bio, "Message data:\n");
+    msg = a->hashed_msg;
+    BIO_dump_indent(bio, (const char *)ASN1_STRING_data(msg),
+                    ASN1_STRING_length(msg), 4);
 
-       return 1;
-       }
+    return 1;
+}