scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 20:00:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed yet another endianess problem, now always using the raw key values for export, sotrage and checksum calculation

Browse Source
This commit is contained in:
TLINDEN
2013-11-18 17:38:03 +01:00
parent 8c9d3289de
commit 5e8324bb0b
21 changed files with 287 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libpcp/key.c
View File

@@ -227,9 +227,13 @@ unsigned char *pcpkey_getchecksum(pcp_key_t *k) {
pcp_key_t * key2be(pcp_key_t *k) {
k->version = htobe32(k->version);
k->serial = htobe32(k->serial);
k->ctime = htobe64(k->ctime);
uint32_t version = k->version;
unsigned char* p = (unsigned char*)&version;
if(p[0] != 0) {
k->version = htobe32(k->version);
k->serial = htobe32(k->serial);
k->ctime = htobe64(k->ctime);
}
return k;
}
@@ -241,9 +245,13 @@ pcp_key_t *key2native(pcp_key_t *k) {
}
pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k) {
k->version = htobe32(k->version);
k->serial = htobe32(k->serial);
k->ctime = htobe64(k->ctime);
uint32_t version = k->version;
unsigned char* p = (unsigned char*)&version;
if(p[0] != 0) {
k->version = htobe32(k->version);
k->serial = htobe32(k->serial);
k->ctime = htobe64(k->ctime);
}
return k;
}
@@ -301,3 +309,28 @@ pcp_key_t *pcp_derive_pcpkey (pcp_key_t *ours, char *theirs) {
return NULL;
}
void pcp_seckeyblob(void *blob, pcp_key_t *k) {
memcpy(blob, k, PCP_RAW_KEYSIZE);
//printf("key (%d):\n", (int)sizeof(pcp_key_t));
//pcpprint_bin(stdout, k, sizeof(pcp_key_t));printf("\n");
//printf("blob (%d):\n", (int)(PCP_RAW_KEYSIZE));
//pcpprint_bin(stdout, blob, PCP_RAW_KEYSIZE);printf("\n");
}
void pcp_pubkeyblob(void *blob, pcp_pubkey_t *k) {
memcpy(blob, k, PCP_RAW_PUBKEYSIZE);
}
void *pcp_keyblob(void *k, int type) {
void *blob;
if(type == PCP_KEY_TYPE_PUBLIC) {
blob = ucmalloc(PCP_RAW_PUBKEYSIZE);
pcp_pubkeyblob(blob, (pcp_pubkey_t *)k);
}
else {
blob = ucmalloc(PCP_RAW_KEYSIZE);
pcp_seckeyblob(blob, (pcp_key_t *)k);
}
return blob;
}