diff options
Diffstat (limited to 'src/gnsrecord/gnunet-gnsrecord-tvg.c')
-rw-r--r-- | src/gnsrecord/gnunet-gnsrecord-tvg.c | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/src/gnsrecord/gnunet-gnsrecord-tvg.c b/src/gnsrecord/gnunet-gnsrecord-tvg.c index 789ff8aa3..47b13bdab 100644 --- a/src/gnsrecord/gnunet-gnsrecord-tvg.c +++ b/src/gnsrecord/gnunet-gnsrecord-tvg.c | |||
@@ -90,28 +90,38 @@ run (void *cls, | |||
90 | struct GNUNET_TIME_Absolute exp_abs = GNUNET_TIME_absolute_get (); | 90 | struct GNUNET_TIME_Absolute exp_abs = GNUNET_TIME_absolute_get (); |
91 | struct GNUNET_GNSRECORD_Block *rrblock; | 91 | struct GNUNET_GNSRECORD_Block *rrblock; |
92 | char *bdata; | 92 | char *bdata; |
93 | struct GNUNET_CRYPTO_EcdsaPrivateKey id_priv; | 93 | struct GNUNET_IDENTITY_PrivateKey id_priv; |
94 | struct GNUNET_CRYPTO_EcdsaPublicKey id_pub; | 94 | struct GNUNET_IDENTITY_PublicKey id_pub; |
95 | struct GNUNET_CRYPTO_EcdsaPrivateKey pkey_data_p; | 95 | struct GNUNET_IDENTITY_PrivateKey pkey_data_p; |
96 | struct GNUNET_CRYPTO_EcdsaPublicKey pkey_data; | 96 | struct GNUNET_IDENTITY_PublicKey pkey_data; |
97 | void *data; | 97 | void *data; |
98 | size_t data_size; | 98 | size_t data_size; |
99 | char *rdata; | 99 | char *rdata; |
100 | size_t rdata_size; | 100 | size_t rdata_size; |
101 | 101 | char ztld[128]; | |
102 | GNUNET_CRYPTO_ecdsa_key_create (&id_priv); | 102 | |
103 | GNUNET_CRYPTO_ecdsa_key_get_public (&id_priv, | 103 | id_priv.type = htonl (GNUNET_GNSRECORD_TYPE_PKEY); |
104 | &id_pub); | 104 | GNUNET_CRYPTO_ecdsa_key_create (&id_priv.ecdsa_key); |
105 | fprintf (stdout, "Zone private key (d, little-endian scalar):\n"); | 105 | GNUNET_IDENTITY_key_get_public (&id_priv, |
106 | print_bytes (&id_priv, sizeof(id_priv), 0); | 106 | &id_pub); |
107 | fprintf (stdout, "Zone private key (d, little-endian, with ztype prepended):\n"); | ||
108 | print_bytes (&id_priv, GNUNET_IDENTITY_key_get_length (&id_pub), 8); //FIXME length for privkey? | ||
109 | fprintf (stdout, "\n"); | ||
110 | fprintf (stdout, "Zone identifier (zid):\n"); | ||
111 | print_bytes (&id_pub, GNUNET_IDENTITY_key_get_length (&id_pub), 8); | ||
112 | GNUNET_STRINGS_data_to_string (&id_pub, | ||
113 | GNUNET_IDENTITY_key_get_length (&id_pub), | ||
114 | ztld, | ||
115 | sizeof (ztld)); | ||
107 | fprintf (stdout, "\n"); | 116 | fprintf (stdout, "\n"); |
108 | fprintf (stdout, "Zone public key (zk):\n"); | 117 | fprintf (stdout, "Encoded zone identifier (zkl = zTLD):\n"); |
109 | print_bytes (&id_pub, sizeof(id_pub), 0); | 118 | fprintf (stdout, "%s\n", ztld); |
110 | fprintf (stdout, "\n"); | 119 | fprintf (stdout, "\n"); |
111 | 120 | ||
112 | GNUNET_CRYPTO_ecdsa_key_create (&pkey_data_p); | 121 | pkey_data_p.type = htonl (GNUNET_GNSRECORD_TYPE_PKEY); |
113 | GNUNET_CRYPTO_ecdsa_key_get_public (&pkey_data_p, | 122 | GNUNET_CRYPTO_ecdsa_key_create (&pkey_data_p.ecdsa_key); |
114 | &pkey_data); | 123 | GNUNET_IDENTITY_key_get_public (&pkey_data_p, |
124 | &pkey_data); | ||
115 | fprintf (stdout, | 125 | fprintf (stdout, |
116 | "Label: %s\nRRCOUNT: %d\n\n", TEST_RECORD_LABEL, TEST_RRCOUNT); | 126 | "Label: %s\nRRCOUNT: %d\n\n", TEST_RECORD_LABEL, TEST_RRCOUNT); |
117 | memset (rd, 0, sizeof (struct GNUNET_GNSRECORD_Data) * 2); | 127 | memset (rd, 0, sizeof (struct GNUNET_GNSRECORD_Data) * 2); |
@@ -147,19 +157,20 @@ run (void *cls, | |||
147 | TEST_RECORD_LABEL, | 157 | TEST_RECORD_LABEL, |
148 | rd, | 158 | rd, |
149 | TEST_RRCOUNT); | 159 | TEST_RRCOUNT); |
150 | size_t bdata_size = ntohl (rrblock->purpose.size) | 160 | size_t bdata_size = ntohl (rrblock->ecdsa_block.purpose.size) |
151 | - sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose) | 161 | - sizeof(struct GNUNET_CRYPTO_EccSignaturePurpose) |
152 | - sizeof(struct GNUNET_TIME_AbsoluteNBO); | 162 | - sizeof(struct GNUNET_TIME_AbsoluteNBO); |
153 | size_t rrblock_size = ntohl (rrblock->purpose.size) | 163 | size_t ecblock_size = ntohl (rrblock->ecdsa_block.purpose.size) |
154 | + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) | 164 | + sizeof(struct GNUNET_CRYPTO_EcdsaPublicKey) |
155 | + sizeof(struct GNUNET_CRYPTO_EcdsaSignature); | 165 | + sizeof(struct GNUNET_CRYPTO_EcdsaSignature); |
166 | size_t block_size = ecblock_size + sizeof (uint32_t); | ||
156 | 167 | ||
157 | bdata = (char*) &rrblock[1]; | 168 | bdata = (char*) &(&rrblock->ecdsa_block)[1]; |
158 | fprintf (stdout, "BDATA:\n"); | 169 | fprintf (stdout, "BDATA:\n"); |
159 | print_bytes (bdata, bdata_size, 8); | 170 | print_bytes (bdata, bdata_size, 8); |
160 | fprintf (stdout, "\n"); | 171 | fprintf (stdout, "\n"); |
161 | fprintf (stdout, "RRBLOCK:\n"); | 172 | fprintf (stdout, "RRBLOCK:\n"); |
162 | print_bytes (rrblock, rrblock_size, 8); | 173 | print_bytes (rrblock, block_size, 8); |
163 | fprintf (stdout, "\n"); | 174 | fprintf (stdout, "\n"); |
164 | 175 | ||
165 | } | 176 | } |