Changeset 246
- Timestamp:
- 10/24/05 16:02:19
- Files:
-
- openpgpsdk/trunk/examples/packet-dump.c (modified) (2 diffs)
- openpgpsdk/trunk/include/openpgpsdk/packet.h (modified) (2 diffs)
- openpgpsdk/trunk/src/packet-parse.c (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
openpgpsdk/trunk/examples/packet-dump.c
r241 r246 707 707 print_unsigned_int("Signature Version", 708 708 content->signature.version); 709 if (content->signature. version == 3)709 if (content->signature.creation_time_set) 710 710 print_time("Signature Creation Time", content->signature.creation_time); 711 711 … … 714 714 content->signature.type); 715 715 716 print_hexdump_data("Signer ID", 717 content->signature.signer_id, 718 sizeof content->signature.signer_id); 716 if(content->signature.signer_id_set) 717 print_hexdump_data("Signer ID", 718 content->signature.signer_id, 719 sizeof content->signature.signer_id); 719 720 720 721 print_string_and_value("Public Key Algorithm", openpgpsdk/trunk/include/openpgpsdk/packet.h
r241 r246 491 491 ops_sig_version_t version; /*!< signature version number */ 492 492 ops_sig_type_t type; /*!< signature type value */ 493 time_t creation_time; /*!< creation time of the signature - only with v3 signatures*/493 time_t creation_time; /*!< creation time of the signature */ 494 494 unsigned char signer_id[OPS_KEY_ID_SIZE]; /*!< Eight-octet key ID of signer*/ 495 495 ops_public_key_algorithm_t key_algorithm; /*!< public key algorithm number */ … … 499 499 size_t v4_hashed_data_start; // only valid if accumulate is set 500 500 size_t v4_hashed_data_length; 501 ops_boolean_t creation_time_set:1; 502 ops_boolean_t signer_id_set:1; 501 503 } ops_signature_t; 502 504 openpgpsdk/trunk/src/packet-parse.c
r241 r246 999 999 if(!limited_read_time(&C.signature.creation_time,region,opt)) 1000 1000 return 0; 1001 1002 if(!ops_limited_read(C.signature.signer_id,8,region,opt)) 1003 return 0; 1001 C.signature.creation_time_set=ops_true; 1002 1003 if(!ops_limited_read(C.signature.signer_id,OPS_KEY_ID_SIZE,region,opt)) 1004 return 0; 1005 C.signature.signer_id_set=ops_true; 1004 1006 1005 1007 if(!ops_limited_read(c,1,region,opt)) … … 1109 1111 if(!limited_read_time(&C.ss_time.time,&subregion,opt)) 1110 1112 return 0; 1113 if(content.tag == OPS_PTAG_SS_CREATION_TIME) 1114 { 1115 sig->creation_time=C.ss_time.time; 1116 sig->creation_time_set=ops_true; 1117 } 1111 1118 break; 1112 1119 … … 1128 1135 return 0; 1129 1136 memcpy(sig->signer_id,C.ss_issuer_key_id.key_id,OPS_KEY_ID_SIZE); 1137 sig->signer_id_set=ops_true; 1130 1138 break; 1131 1139 … … 1408 1416 ops_parser_content_t content; 1409 1417 1418 memset(&C.signature,'\0',sizeof C.signature); 1410 1419 C.signature.version=OPS_SIG_V4; 1411 1420 C.signature.v4_hashed_data_start=v4_hashed_data_start;
