Changeset 368
- Timestamp:
- 02/19/06 15:35:42
- Files:
-
- openpgpsdk/trunk/examples/packet-dump.c (modified) (3 diffs)
- openpgpsdk/trunk/include/openpgpsdk/packet-show.h (modified) (1 diff)
- openpgpsdk/trunk/src/packet-show.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openpgpsdk/trunk/examples/packet-dump.c
r367 r368 243 243 } 244 244 245 static void print_string_and_value( char *name, char *str, unsigned char value) 245 static void print_string_and_value(char *name,const char *str, 246 unsigned char value) 246 247 { 247 248 print_name(name); … … 378 379 const ops_parser_content_union_t *content=&content_->content; 379 380 ops_text_t *text; 380 c har *str;381 const char *str; 381 382 ops_key_data_t *decrypter; 382 383 const ops_secret_key_t *secret; … … 759 760 &content->ss_revocation_reason.code, 760 761 1); 761 str =ops_show_ss_rr_code(content->ss_revocation_reason.code);762 str=ops_show_ss_rr_code(content->ss_revocation_reason.code); 762 763 print_string(NULL,str); 763 764 /* xxx - todo : output text as UTF-8 string */ openpgpsdk/trunk/include/openpgpsdk/packet-show.h
r367 r368 37 37 void ops_text_free(ops_text_t *text); 38 38 39 c har *ops_show_packet_tag(ops_packet_tag_t packet_tag);40 c har *ops_show_ss_type(ops_ss_type_t ss_type);39 const char *ops_show_packet_tag(ops_packet_tag_t packet_tag); 40 const char *ops_show_ss_type(ops_ss_type_t ss_type); 41 41 42 c har *ops_show_sig_type(ops_sig_type_t sig_type);43 c har *ops_show_pka(ops_public_key_algorithm_t pka);42 const char *ops_show_sig_type(ops_sig_type_t sig_type); 43 const char *ops_show_pka(ops_public_key_algorithm_t pka); 44 44 45 45 ops_text_t *ops_showall_ss_preferred_compression(ops_ss_preferred_compression_t ss_preferred_compression); 46 c har *ops_show_ss_preferred_compression(unsigned char octet);46 const char *ops_show_ss_preferred_compression(unsigned char octet); 47 47 48 48 ops_text_t *ops_showall_ss_preferred_hash(ops_ss_preferred_hash_t ss_preferred_hash); 49 c har *ops_show_hash_algorithm(unsigned char octet);50 c har *ops_show_symmetric_algorithm(unsigned char hash);49 const char *ops_show_hash_algorithm(unsigned char octet); 50 const char *ops_show_symmetric_algorithm(unsigned char hash); 51 51 52 52 ops_text_t *ops_showall_ss_preferred_ska(ops_ss_preferred_ska_t ss_preferred_ska); 53 c har *ops_show_ss_preferred_ska(unsigned char octet);53 const char *ops_show_ss_preferred_ska(unsigned char octet); 54 54 55 c har *ops_show_ss_rr_code(ops_ss_rr_code_t ss_rr_code);55 const char *ops_show_ss_rr_code(ops_ss_rr_code_t ss_rr_code); 56 56 57 57 ops_text_t *ops_showall_ss_features(ops_ss_features_t ss_features); 58 58 59 59 ops_text_t *ops_showall_ss_key_flags(ops_ss_key_flags_t ss_key_flags); 60 c har *ops_show_ss_key_flag(unsigned char octet, ops_bit_map_t *map);60 const char *ops_show_ss_key_flag(unsigned char octet, ops_bit_map_t *map); 61 61 62 62 ops_text_t *ops_showall_ss_key_server_prefs(ops_ss_key_server_prefs_t ss_key_server_prefs); 63 char *ops_show_ss_key_server_prefs(unsigned char octet, ops_bit_map_t *map); 63 const char *ops_show_ss_key_server_prefs(unsigned char octet, 64 ops_bit_map_t *map); 64 65 65 66 ops_text_t *ops_showall_ss_notation_data_flags(ops_ss_notation_data_t ss_notation_data); openpgpsdk/trunk/src/packet-show.c
r367 r368 251 251 } 252 252 253 static unsigned int add_str(ops_list_t *list, 253 static unsigned int add_str(ops_list_t *list,char *str) 254 254 { 255 255 if (list->size==list->used) … … 311 311 312 312 /*! generic function which adds text derived from single octet map to text */ 313 static unsigned int add_str_from_octet_map(ops_text_t *text, char *str, unsigned char octet) 313 static unsigned int add_str_from_octet_map(ops_text_t *text,char *str, 314 unsigned char octet) 314 315 { 315 316 if (str && !add_str(&text->known,str)) … … 367 368 368 369 static ops_text_t *text_from_bytemapped_octets(ops_data_t *data, 369 c har *(*text_fn)(unsigned char octet))370 const char *(*text_fn)(unsigned char octet)) 370 371 { 371 372 372 373 ops_text_t *text=NULL; 373 c har *str;374 const char *str; 374 375 unsigned i; 375 376 … … 388 389 389 390 /*! and add to text */ 390 if (!add_str_from_octet_map(text,str ,data->contents[i]))391 if (!add_str_from_octet_map(text,strdup(str),data->contents[i])) 391 392 { 392 393 ops_text_free(text); … … 456 457 * \return string or "Unknown" 457 458 */ 458 c har *ops_show_packet_tag(ops_packet_tag_t packet_tag)459 const char *ops_show_packet_tag(ops_packet_tag_t packet_tag) 459 460 { 460 461 return show_packet_tag(packet_tag,packet_tag_map); … … 468 469 * \return string or "Unknown" 469 470 */ 470 c har *ops_show_ss_type(ops_ss_type_t ss_type)471 const char *ops_show_ss_type(ops_ss_type_t ss_type) 471 472 { 472 473 return show_ss_type(ss_type,ss_type_map); … … 481 482 * \return string or "Unknown" 482 483 */ 483 c har *ops_show_ss_rr_code(ops_ss_rr_code_t ss_rr_code)484 const char *ops_show_ss_rr_code(ops_ss_rr_code_t ss_rr_code) 484 485 { 485 486 return show_ss_rr_code(ss_rr_code,ss_rr_code_map); … … 494 495 * \return string or "Unknown" 495 496 */ 496 c har *ops_show_sig_type(ops_sig_type_t sig_type)497 const char *ops_show_sig_type(ops_sig_type_t sig_type) 497 498 { 498 499 return show_sig_type(sig_type, sig_type_map); … … 507 508 * \return string or "Unknown" 508 509 */ 509 c har *ops_show_pka(ops_public_key_algorithm_t pka)510 const char *ops_show_pka(ops_public_key_algorithm_t pka) 510 511 { 511 512 return show_pka(pka, public_key_algorithm_map); … … 518 519 * \return string or "Unknown" 519 520 */ 520 c har *ops_show_ss_preferred_compression(unsigned char octet)521 const char *ops_show_ss_preferred_compression(unsigned char octet) 521 522 { 522 523 return ops_str_from_map(octet,compression_algorithm_map); … … 548 549 * \return string or "Unknown" 549 550 */ 550 c har *ops_show_hash_algorithm(unsigned char hash)551 const char *ops_show_hash_algorithm(unsigned char hash) 551 552 { 552 553 return show_hash_algorithm(hash); … … 568 569 } 569 570 570 c har *ops_show_symmetric_algorithm(unsigned char hash)571 const char *ops_show_symmetric_algorithm(unsigned char hash) 571 572 { 572 573 return show_symmetric_algorithm(hash); … … 580 581 * \return string or "Unknown" 581 582 */ 582 c har *ops_show_ss_preferred_ska(unsigned char octet)583 const char *ops_show_ss_preferred_ska(unsigned char octet) 583 584 { 584 585 return ops_str_from_map(octet,symmetric_algorithm_map); … … 666 667 * \todo add reference 667 668 */ 668 c har *ops_show_ss_key_flag(unsigned char octet, ops_bit_map_t *map)669 const char *ops_show_ss_key_flag(unsigned char octet, ops_bit_map_t *map) 669 670 { 670 671 return str_from_bitfield(octet,map); … … 684 685 { 685 686 ops_text_t *text=NULL; 686 c har *str;687 const char *str; 687 688 int i=0; 688 689 unsigned char mask, bit; 689 690 690 691 text=malloc(sizeof(ops_text_t)); 691 692 if (!text) 692 693 return NULL; … … 696 697 /* xxx - TBD: extend to handle multiple octets of bits - rachel */ 697 698 698 for (i=0, mask=0x80; i<8; i++, mask = mask>>1)699 for (i=0,mask=0x80 ; i < 8 ; i++,mask=mask >> 1) 699 700 { 700 bit = ss_key_flags.data.contents[0] &mask;701 if 701 bit=ss_key_flags.data.contents[0]&mask; 702 if(bit) 702 703 { 703 str=ops_show_ss_key_flag ( bit, &ss_key_flags_map[0]);704 if (!add_str_from_bit_map( text, str,bit))704 str=ops_show_ss_key_flag(bit,&ss_key_flags_map[0]); 705 if(!add_str_from_bit_map(text,strdup(str),bit)) 705 706 { 706 707 ops_text_free(text); … … 724 725 * \todo make typesafe 725 726 */ 726 char *ops_show_ss_key_server_prefs(unsigned char prefs, ops_bit_map_t *map) 727 const char *ops_show_ss_key_server_prefs(unsigned char prefs, 728 ops_bit_map_t *map) 727 729 { 728 730 return str_from_bitfield(prefs,map); … … 742 744 { 743 745 ops_text_t *text=NULL; 744 c har *str;746 const char *str; 745 747 int i=0; 746 748 unsigned char mask, bit; … … 754 756 /* xxx - TBD: extend to handle multiple octets of bits - rachel */ 755 757 756 for (i=0, mask=0x80; i<8; i++, mask = mask>>1)758 for (i=0,mask=0x80 ; i < 8 ; i++,mask=mask >> 1) 757 759 { 758 bit = ss_key_server_prefs.data.contents[0] &mask;760 bit=ss_key_server_prefs.data.contents[0]&mask; 759 761 if (bit) 760 762 { 761 str=ops_show_ss_key_server_prefs ( bit, &ss_key_server_prefs_map[0] ); 762 if (!add_str_from_bit_map( text, str, bit)) 763 str=ops_show_ss_key_server_prefs(bit, 764 &ss_key_server_prefs_map[0]); 765 if(!add_str_from_bit_map( text, strdup(str), bit)) 763 766 { 764 767 ops_text_free(text);
