debug's weg

diff --git a/dnssec.c b/dnssec.c
index 12f4170544c0c36473a502454f047bde0050b20f..d16a7c1bd63a5cf339439c6dd602644ce890030e 100644 (file)
--- a/dnssec.c
+++ b/dnssec.c
@@ -718,42 +718,34 @@ ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys)
                                        ldns_rr_list_rr(rrset_clone, i), orig_ttl);
                }
 
-               printf("hier zijn we I\n");
                /* fill in what we now of the signature */
                /* set the orig_ttl */
                ldns_rr_rrsig_set_origttl(current_sig, ldns_native2rdf_int32(LDNS_RDF_TYPE_INT32, orig_ttl));
                /* the signers name */
                ldns_rr_rrsig_set_signame(current_sig, 
                                ldns_key_pubkey_owner(current_key));
-               printf("hier zijn we I\n");
                /* label count - get it from the first rr in the rr_list */
                ldns_rr_rrsig_set_labels(current_sig, 
                                ldns_native2rdf_int8(LDNS_RDF_TYPE_INT8, ldns_rr_label_count(
                                                ldns_rr_list_rr(rrset_clone, 0))));
-               printf("hier zijn we II\n");
                /* inception, expiration */
                ldns_rr_rrsig_set_inception(current_sig,
                                ldns_native2rdf_int32(LDNS_RDF_TYPE_INT32, ldns_key_inception(current_key)));
-               printf("hier zijn we III\n");
                ldns_rr_rrsig_set_expiration(current_sig,
                                ldns_native2rdf_int32(LDNS_RDF_TYPE_INT32, ldns_key_expiration(current_key)));
-               printf("hier zijn we IV\n");
                /* key-tag */
                ldns_rr_rrsig_set_keytag(current_sig,
                                ldns_native2rdf_int16(LDNS_RDF_TYPE_INT16, ldns_key_keytag(current_key)));
 
-               printf("hier zijn we V\n");
                /* algorithm - check the key and substitute that */
                ldns_rr_rrsig_set_algorithm(current_sig,
                                ldns_native2rdf_int8(LDNS_RDF_TYPE_ALG, ldns_key_algorithm(current_key)));
                
-               printf("hier zijn we XI\n");
                /* type-covered */
                ldns_rr_rrsig_set_typecovered(current_sig,
                                ldns_native2rdf_int16(LDNS_RDF_TYPE_TYPE,
                                        ldns_rr_get_type(ldns_rr_list_rr(rrset_clone, 0))));
 
-               printf("hier zijn we CX\n");
                /* right now, we have: a key, a semi-sig and an rrset. For
                 * which we can create the sig and base64 encode that and
                 * add that to the signature */
@@ -763,26 +755,23 @@ ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys)
                        /* ERROR */
                        return NULL;
                }
-               printf("hier zijn we CXI\n");
                /* add the rrset in sign_buf */
                if (ldns_rr_list2buffer_wire(sign_buf, rrset_clone) != LDNS_STATUS_OK) {
                        printf("couldn't convert to buffer 2\n");
                        ldns_buffer_free(sign_buf);
                        return NULL;
                }
+               ldns_rr_print(stdout, current_sig);
+               printf("\n");
                
-               printf("blalaat\\\n\n");
                switch(ldns_key_algorithm(current_key)) {
                        case LDNS_SIGN_DSA:
-                               printf("dsa\n");
                                b64rdf = ldns_sign_public_dsa(sign_buf, ldns_key_dsa_key(current_key));
                                break;
                        case LDNS_SIGN_RSASHA1:
-                               printf("rsa sha1\n");
                                b64rdf = ldns_sign_public_rsasha1(sign_buf, ldns_key_rsa_key(current_key));
                                break;
                        case LDNS_SIGN_RSAMD5:
-                               printf("rsa md5\n");
                                b64rdf = ldns_sign_public_rsamd5(sign_buf, ldns_key_rsa_key(current_key));
                                break;
                        default:
@@ -794,13 +783,20 @@ ldns_sign_public(ldns_rr_list *rrset, ldns_key_list *keys)
                        printf("couldn't sign!\n");
                        return NULL;
                }
+               ldns_rr_print(stdout, current_sig);
+               printf("\n");
                ldns_rr_rrsig_set_sig(current_sig, b64rdf);
 
                /* push the signature to the signatures list */
                ldns_rr_list_push_rr(signatures, current_sig);
 
+               ldns_rr_print(stdout, current_sig);
+               printf("\n");
+
                printf("mag ik dit niet free-en?!\n");
+#if 0
                ldns_buffer_free(sign_buf); /* restart for the next key */
+#endif
         }
        return signatures;
 }
@@ -831,7 +827,8 @@ ldns_sign_public_dsa(ldns_buffer *to_sign, DSA *key)
        
        sigdata_rdf = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, siglen, 
                        ldns_buffer_begin(b64sig));
-       FREE(sha1_hash);
+       /* FREE(sha1_hash); - don't free -> invalid pointer, huh? Memleak?
+        */
        ldns_buffer_free(b64sig);
        return sigdata_rdf;
 }
@@ -861,8 +858,9 @@ ldns_sign_public_rsasha1(ldns_buffer *to_sign, RSA *key)
                        &siglen, key);
        sigdata_rdf = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, siglen, 
                        ldns_buffer_begin(b64sig));
-       FREE(sha1_hash);
        ldns_buffer_free(b64sig);
+       ldns_rdf_print(stdout, sigdata_rdf);
+       printf("dat was een rdf\n");
        return sigdata_rdf;
 }
 
@@ -892,7 +890,6 @@ ldns_sign_public_rsamd5(ldns_buffer *to_sign, RSA *key)
 
        sigdata_rdf = ldns_rdf_new_frm_data(LDNS_RDF_TYPE_B64, siglen, 
                        ldns_buffer_begin(b64sig));
-       FREE(md5_hash);
        ldns_buffer_free(b64sig);
        return sigdata_rdf;
 }