X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fts%2Fts_lib.c;h=087334bcbd49229aa317f58e4b37b99f2b2a7538;hb=9ff9bccc41c385ec2aa8ee2123f083b52b56b7b4;hp=c8f41f6fd017cebe341a88ac3d6bce702f5da728;hpb=2cbc8d7de5265aa86f739a5f7806d95eb8c31c87;p=oweals%2Fopenssl.git

diff --git a/crypto/ts/ts_lib.c b/crypto/ts/ts_lib.c
index c8f41f6fd0..087334bcbd 100644
--- a/crypto/ts/ts_lib.c
+++ b/crypto/ts/ts_lib.c
@@ -1,6 +1,6 @@
-/* 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 +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,90 +57,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 <openssl/ts.h>
-
-/* Local function declarations. */
-
-/* Function definitions. */
+#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) 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;
-	}
+{
+    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];
+{
+    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);
+    int len = OBJ_obj2txt(obj_txt, sizeof(obj_txt), obj, 0);
+    BIO_write(bio, obj_txt, len);
+    BIO_write(bio, "\n", 1);
 
-	return 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", "");
-			M_ASN1_OCTET_STRING_print(bio, ex->value);
-			}
-		BIO_write(bio, "\n", 1);
-		}
-
-	return 1;
-	}
+{
+    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 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)
-	{
-	const 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;
+}