minor improvements in dsa creation, not working completely yet

diff --git a/dnssec.c b/dnssec.c
index b501f08fb6edefc2560f581f3b5076ef19ce81a2..26f841a4a68849608b774a775f9a66a66e4e51ae 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -160,9 +160,6 @@ ldns_verify_rrsig(ldns_rr_list *rrset, ldns_rr *rrsig, ldns_rr_list *keys)
                return false;
        }
 
-       /* no longer needed */
-       ldns_rr_list_free(rrset_clone);
-
        for(i = 0; i < ldns_rr_list_rr_count(keys); i++) {
                current_key = ldns_rr_list_rr(keys, i);
                key_buf = ldns_buffer_new(MAX_PACKETLEN);
@@ -203,6 +200,8 @@ ldns_verify_rrsig(ldns_rr_list *rrset, ldns_rr *rrsig, ldns_rr_list *keys)
                }
        }
 
+       /* no longer needed */
+       ldns_rr_list_free(rrset_clone);
        ldns_buffer_free(rawsig_buf);
        ldns_buffer_free(verify_buf);
        return result;

diff --git a/keys.c b/keys.c
index c7287e0708bf108078db3088af01954a408d1f26..81d2fdcc4342d9775984779a1e416fa7e346891b 100644 (file)
--- a/keys.c
+++ b/keys.c
@@ -82,6 +82,9 @@ ldns_key_new_frm_algorithm(ldns_signing_algorithm alg, uint16_t size)
                        d = DSA_generate_parameters((int)size, NULL, 0, NULL, NULL, NULL, NULL);
                        DSA_generate_key(d);
                        ldns_key_set_dsa_key(k, d);
+       printf("gen key\n");
+       DSA_print_fp(stdout, d, 0);
+       printf("\n");
                        break;
                case LDNS_SIGN_HMACMD5:
                        /* do your hmac thing here */
@@ -323,13 +326,9 @@ static bool
 ldns_key_dsa2bin(unsigned char *data, DSA *k, uint16_t *size)
 {
        uint8_t T;
-
        /* See RFC2536 */
-/*
-       T = (uint8_t) ((DSA_size(k) - 512) / 64);
-*/
-       /* don't know if this is the right size */
-       T = (uint8_t) DSA_size(k) / 8;
+       *size = BN_num_bytes(k->g);
+       T = (*size - 64) / 8;
        memcpy(data, &T, 1);
 
        if (T > 8) {
@@ -338,12 +337,12 @@ ldns_key_dsa2bin(unsigned char *data, DSA *k, uint16_t *size)
                return false;
        }
 
-       *size = 64 + (T * 8); 
-
+       /**size = 64 + (T * 8); */
+       data[0] = T;
        BN_bn2bin(k->q, data + 1 );             /* 20 octects */
-       BN_bn2bin(k->p, data + 22 );            /* offset octects */
-       BN_bn2bin(k->g, data + 23 + *size );    /* offset octets */
-       BN_bn2bin(k->pub_key, data + 24 + *size + *size); /* offset octets */
+       BN_bn2bin(k->p, data + 21 );            /* offset octects */
+       BN_bn2bin(k->g, data + 21 + *size);     /* offset octets */
+       BN_bn2bin(k->pub_key, data + 21 + *size + *size); /* offset octets */
        *size = 24 + (*size * 3);
        return true;
 }