From: Wayne M. <te...@us...> - 2004-11-19 05:04:24
|
Update of /cvsroot/dnssec-tools/dnssec-tools/tools/modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20006 Modified Files: keyrec.pm Log Message: Added 'type' to key fields. Added some special-case code for keys when adding key keyrecs. Only the appropriate key length will be added for the key type. Slightly modify the output format for keyrec fields. Added interfaces to return the list of key fields and zone fields. Index: keyrec.pm =================================================================== RCS file: /cvsroot/dnssec-tools/dnssec-tools/tools/modules/keyrec.pm,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** keyrec.pm 19 Nov 2004 01:21:53 -0000 1.6 --- keyrec.pm 19 Nov 2004 05:04:12 -0000 1.7 *************** *** 47,50 **** --- 47,51 ---- # my @KEYFIELDS = ( + 'type', 'algorithm', 'random', *************** *** 55,59 **** 'keyrec_gensec', 'keyrec_gendate', ! ); # --- 56,60 ---- 'keyrec_gensec', 'keyrec_gendate', ! ); # *************** *** 69,73 **** 'keyrec_signsec', 'keyrec_signdate', ! ); my @keyreclines; # Keyrec lines. --- 70,74 ---- 'keyrec_signsec', 'keyrec_signdate', ! ); my @keyreclines; # Keyrec lines. *************** *** 529,537 **** # # Add the field to the hash table and to the keyrec # file contents array. # $keyrecs{$krname}{$fn} = $fields{$fn}; ! $keyreclines[$keyreclen] = "\t$fn\t\"$fields{$fn}\"\n"; $keyreclen++; } --- 530,550 ---- # + # Special case for keys: Only give the key length + # for the key's type. + # + if((($fields{'type'} eq 'zsk') && + ($fn eq 'ksklength')) || + (($fields{'type'} eq 'ksk') && + ($fn eq 'zsklength'))) + { + next; + } + + # # Add the field to the hash table and to the keyrec # file contents array. # $keyrecs{$krname}{$fn} = $fields{$fn}; ! $keyreclines[$keyreclen] = "\t$fn\t\t\"$fields{$fn}\"\n"; $keyreclen++; } *************** *** 578,581 **** --- 591,616 ---- #-------------------------------------------------------------------------- # + # Routine: keyrec_keyfields() + # + # Purpose: Return the list of key fields. + # + sub keyrec_keyfields + { + return(@KEYFIELDS); + } + + #-------------------------------------------------------------------------- + # + # Routine: keyrec_zonefields() + # + # Purpose: Return the list of zone fields. + # + sub keyrec_zonefields + { + return(@ZONEFIELDS); + } + + #-------------------------------------------------------------------------- + # # Routine: keyrec_save() # |