danetool: added option to print the raw entries.

diff --git a/src/danetool-args.def b/src/danetool-args.def
index 7df44d6a59d3a09dae30888224e8a6f0305f2ba0..f6a4cb7f702e1541b2868e291002d0c4860ad706 100644 (file)
--- a/src/danetool-args.def
+++ b/src/danetool-args.def
@@ -89,6 +89,14 @@ flag = {
     aliases   = inder;
 };
 
+flag = {
+    name      = print-raw;
+    descrip   = "Print the received DANE data in raw format";
+    disabled;
+    disable   = "no";
+    doc = "This option will print the received DANE data.";
+};
+
 flag = {
     name      = tlsa-rr;
     descrip   = "Print the DANE RR data on a certificate or public key";

diff --git a/src/danetool.c b/src/danetool.c
index 82904f87df7854ce9b4334a6a87c510d29ff4fcb..7055b94cc1f8abe21971ae99c37f9b74e8a1cedc 100644 (file)
--- a/src/danetool.c
+++ b/src/danetool.c
@@ -225,6 +225,43 @@ static void dane_check(const char *host, const char *proto,
                exit(1);
        }
 
+       if (ENABLED_OPT(PRINT_RAW)) {
+               unsigned entries;
+               gnutls_datum_t t;
+               char **dane_data;
+               int *dane_data_len;
+               int secure;
+               int bogus;
+               
+               ret = dane_query_to_raw_tlsa(q, &entries, &dane_data,
+                       &dane_data_len, &secure, &bogus);
+               if (ret < 0) {
+                       fprintf(stderr, "dane_query_to_raw_tlsa: %s\n",
+                               dane_strerror(ret));
+                       exit(1);
+               }
+
+               for (i=0;i<entries;i++) {
+                       char *str;
+                       size_t str_size;
+                       t.data = (void*)dane_data[i];
+                       t.size = dane_data_len[i];
+
+                       str_size = t.size * 2 + 1;
+                       str = gnutls_malloc(str_size);
+
+                       ret = gnutls_hex_encode(&t, str, &str_size);
+                       if (ret < 0) {
+                               fprintf(stderr, "gnutls_hex_encode: %s\n",
+                                       dane_strerror(ret));
+                               exit(1);
+                       }
+                       fprintf(outfile, "[%u]: %s\n", i, str);
+                       gnutls_free(str);
+               }
+               fprintf(outfile, "\n");
+       }
+
        entries = dane_query_entries(q);
        for (i = 0; i < entries; i++) {
                ret = dane_query_data(q, i, &usage, &type, &match, &data);