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

more aix/big-endian fixes

Browse Source
This commit is contained in:
TLINDEN
2013-11-18 21:48:24 +01:00
parent 88d947aed7
commit c4940b966c
20 changed files with 231 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libpcp/key.c
View File

@@ -227,6 +227,9 @@ unsigned char *pcpkey_getchecksum(pcp_key_t *k) {
pcp_key_t * key2be(pcp_key_t *k) {
#ifdef __BIG_ENDIAN
return k;
#else
uint32_t version = k->version;
unsigned char* p = (unsigned char*)&version;
if(p[0] != 0) {
@@ -235,16 +238,24 @@ pcp_key_t * key2be(pcp_key_t *k) {
k->ctime = htobe64(k->ctime);
}
return k;
#endif
}
pcp_key_t *key2native(pcp_key_t *k) {
#ifdef __BIG_ENDIAN
return k;
#else
k->version = be32toh(k->version);
k->serial = be32toh(k->serial);
k->ctime = be64toh(k->ctime);
return k;
#endif
}
pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k) {
#ifdef __BIG_ENDIAN
return k;
#else
uint32_t version = k->version;
unsigned char* p = (unsigned char*)&version;
if(p[0] != 0) {
@@ -253,13 +264,18 @@ pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k) {
k->ctime = htobe64(k->ctime);
}
return k;
#endif
}
pcp_pubkey_t *pubkey2native(pcp_pubkey_t *k) {
#ifdef __BIG_ENDIAN
return k;
#else
k->version = be32toh(k->version);
k->serial = be32toh(k->serial);
k->ctime = be64toh(k->ctime);
return k;
#endif
}
pcp_key_t *pcp_derive_pcpkey (pcp_key_t *ours, char *theirs) {
@@ -312,10 +328,6 @@ pcp_key_t *pcp_derive_pcpkey (pcp_key_t *ours, char *theirs) {
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) {

54
libpcp/vault.c
View File

@@ -128,7 +128,7 @@ int pcpvault_create(vault_t *vault) {
return 0;
}
int pcpvault_additem(vault_t *vault, void *item, size_t itemsize, uint8_t type, uint8_t do_hash) {
int pcpvault_additem(vault_t *vault, void *item, size_t itemsize, uint8_t type) {
vault_item_header_t *header = ucmalloc(sizeof(vault_item_header_t));
header->type = type;
header->size = itemsize;
@@ -136,22 +136,8 @@ int pcpvault_additem(vault_t *vault, void *item, size_t itemsize, uint8_t type,
crypto_hash_sha256((unsigned char*)header->checksum, item, itemsize);
ih2be(header);
void *saveitem = ucmalloc(itemsize);
memcpy(saveitem, item, itemsize);
fwrite(header, sizeof(vault_item_header_t), 1, vault->fd);
fwrite(saveitem, itemsize, 1, vault->fd);
memset(saveitem, 0, itemsize);
free(saveitem);
if(do_hash == 1) {
// we don't re-hash if it's a full update
pcphash_add(item, type);
pcpvault_update_checksum(vault);
}
fwrite(item, itemsize, 1, vault->fd);
if(ferror(vault->fd) != 0) {
fatal("Failed to add an item to vault %s!\n", vault->filename);
@@ -168,14 +154,19 @@ int pcpvault_addkey(vault_t *vault, void *item, uint8_t type) {
vault_t *tmp = pcpvault_new(vault->filename, 1);
size_t itemsize;
void *saveitem;
if(type == PCP_KEY_TYPE_PUBLIC) {
pubkey2be((pcp_pubkey_t *)item);
itemsize = PCP_RAW_PUBKEYSIZE;
saveitem = ucmalloc(sizeof(pcp_pubkey_t));
memcpy(saveitem, item, sizeof(pcp_pubkey_t));
pubkey2be((pcp_pubkey_t *)item);
}
else {
//pcp_dumpkey((pcp_key_t *)item);
key2be((pcp_key_t *)item);
itemsize = PCP_RAW_KEYSIZE;
saveitem = ucmalloc(sizeof(pcp_key_t));
memcpy(saveitem, item, sizeof(pcp_key_t));
key2be((pcp_key_t *)item);
}
void *blob = pcp_keyblob(item, type);
@@ -183,9 +174,12 @@ int pcpvault_addkey(vault_t *vault, void *item, uint8_t type) {
if(tmp != NULL) {
if(pcpvault_copy(vault, tmp) != 0)
goto errak1;
if(pcpvault_additem(tmp, blob, itemsize, type, 1) != 0)
if(pcpvault_additem(tmp, blob, itemsize, type) != 0)
goto errak1;
pcphash_add(saveitem, type);
pcpvault_update_checksum(tmp);
if(pcpvault_copy(tmp, vault) == 0) {
pcpvault_unlink(tmp);
}
@@ -217,13 +211,13 @@ int pcpvault_writeall(vault_t *vault) {
pcp_key_t *k = NULL;
pcphash_iterate(k) {
pcp_seckeyblob(blob_s, k);
if(pcpvault_additem(tmp, blob_s, PCP_RAW_KEYSIZE, PCP_KEY_TYPE_SECRET, 0) != 0)
if(pcpvault_additem(tmp, blob_s, PCP_RAW_KEYSIZE, PCP_KEY_TYPE_SECRET) != 0)
goto errwa;
}
pcp_pubkey_t *p = NULL;
pcphash_iteratepub(p) {
pcp_pubkeyblob(blob_p, p);
if(pcpvault_additem(tmp, blob_p, PCP_RAW_PUBKEYSIZE, PCP_KEY_TYPE_PUBLIC, 0) != 0)
if(pcpvault_additem(tmp, blob_p, PCP_RAW_PUBKEYSIZE, PCP_KEY_TYPE_PUBLIC) != 0)
goto errwa;
}
pcpvault_update_checksum(tmp);
@@ -357,25 +351,41 @@ int pcpvault_close(vault_t *vault) {
}
vault_header_t * vh2be(vault_header_t *h) {
#ifdef __BIG_ENDIAN
return h;
#else
h->version = htobe32(h->version);
return h;
#endif
}
vault_header_t * vh2native(vault_header_t *h) {
#ifdef __BIG_ENDIAN
return h;
#else
h->version = be32toh(h->version);
return h;
#endif
}
vault_item_header_t * ih2be(vault_item_header_t *h) {
#ifdef __BIG_ENDIAN
return h;
#else
h->version = htobe32(h->version);
h->size = htobe32(h->size);
return h;
#endif
}
vault_item_header_t * ih2native(vault_item_header_t *h) {
#ifdef __BIG_ENDIAN
return h;
#else
h->version = be32toh(h->version);
h->size = be32toh(h->size);
return h;
#endif
}