Changeset Navigation

Changeset 594

Timestamp:

08/22/08 14:24:47

Author:

rachel

Message:

Added test to check that userid and keyid are available from keys
in valid keyring after validation.
Fixed code which caused that test to fail.

Files:

r574	r594
111	111
112	112	// increase size of array
113		newsize=~~sizeof signer~~ * result->valid_count;
	113	newsize=(sizeof signer) result->valid_count;
114	114	if (!result->valid_keys)
115	115	result->valid_keys=malloc(newsize);
…	…
118	118
119	119	// copy key ptr to array
120		start=(sizeof signer) * (result->valid_count-1);
121		memcpy(result->valid_keys+start,signer,sizeof signer);
	120	start=(sizeof signer) (result->valid_count-1);
	121	memcpy(result->valid_keys+start,signer,sizeof *signer);
122	122	}
123	123
…	…
131	131
132	132	// increase size of array
133		newsize=~~sizeof signer~~ * result->invalid_count;
	133	newsize=(sizeof signer) result->invalid_count;
134	134	if (!result->invalid_keys)
135	135	result->invalid_keys=malloc(newsize);
…	…
138	138
139	139	// copy key ptr to array
140		start=(sizeof signer) * (result->invalid_count-1);
141		memcpy(result->invalid_keys+start,signer,~~sizeof signer~~);
	140	start=(sizeof signer) (result->invalid_count-1);
	141	memcpy(result->invalid_keys+start,signer,(sizeof *signer));
142	142	}
143	143
…	…
151	151
152	152	// increase size of array
153		newsize=~~sizeof signer_id~~ * result->unknown_signer_count;
	153	newsize=(sizeof signer_id) result->unknown_signer_count;
154	154	if (!result->unknown_keys)
155	155	result->unknown_keys=malloc(newsize);

r573	r594
107	107	int rtn=0;
108	108	ops_boolean_t overwrite=ops_true;
	109	char* userid="Test User 2<test2@nowhere.com>";
	110	const unsigned char* keyid;
109	111
110	112	memset(&pub_keyring, '\0', sizeof pub_keyring);
111	113	memset(&sec_keyring, '\0', sizeof sec_keyring);
112	114
113		uid.user_id=(unsigned char *)"Test User 2<test2@nowhere.com>";
	115
	116	uid.user_id=(unsigned char *) userid;
114	117
115	118	keydata=ops_rsa_create_selfsigned_keypair(1024,65537,&uid);
	119	CU_ASSERT(keydata != NULL);
116	120	pub_key=ops_get_public_key_from_data(keydata);
117	121	sec_key=ops_get_secret_key_from_data(keydata);
118
119		CU_ASSERT(keydata != NULL);
	122	keyid=ops_get_key_id(keydata);
120	123
121	124	/*
…	…
141	144	ops_validate_all_signatures(result, &pub_keyring, NULL);
142	145	CU_ASSERT(result->valid_count==1);
	146	CU_ASSERT(strncmp((char )ops_get_key_id(&result->valid_keys[0]),(char )keyid,strlen((char *)keyid))==0);
	147	CU_ASSERT(strncmp((char *)ops_get_user_id(&result->valid_keys[0],0),userid,strlen(userid))==0);
143	148	CU_ASSERT(result->invalid_count==0);
144	149	CU_ASSERT(result->unknown_signer_count==0);