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 endian issue (I used the wrong define for it)

Browse Source
This commit is contained in:
TLINDEN
2013-11-19 21:02:59 +01:00
parent 8b3b76d52d
commit 04dbf19381
8 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@@ -1 +1,3 @@
aix works now so far, but -R doesnt work - now it does but decryption fails for some unknown reason. aix works now so far, but -R doesnt work - now it does but decryption fails for some unknown reason.
libpcp/z85.c:148 free(z85) leads to coredump on aix sometimes

2
configure vendored
View File

@@ -12658,7 +12658,7 @@ fi
if test -n "$bigendian"; then if test -n "$bigendian"; then
CFLAGS="$CFLAGS -D__BIG_ENDIAN=1" CFLAGS="$CFLAGS -D__CPU_IS_BIG_ENDIAN=1"
fi fi

2
include/pcp/platform.h
View File

@@ -38,7 +38,7 @@
# define htobe64 hto64be # define htobe64 hto64be
# endif # endif
# else // no sys/endian.h # else // no sys/endian.h
# ifdef __BIG_ENDIAN # ifdef __CPU_IS_BIG_ENDIAN
# define be32toh(x) (x) # define be32toh(x) (x)
# define htobe32(x) (x) # define htobe32(x) (x)
# define be64toh(x) (x) # define be64toh(x) (x)

12
libpcp/crypto.c
View File

@@ -85,7 +85,11 @@ unsigned char *pcp_box_encrypt(pcp_key_t *secret, pcp_pubkey_t *public,
unsigned char *message, size_t messagesize, unsigned char *message, size_t messagesize,
size_t *csize) { size_t *csize) {
unsigned char *nonce = pcp_gennonce(); //unsigned char *nonce = pcp_gennonce();
unsigned char *nonce = ucmalloc(crypto_secretbox_NONCEBYTES);
memset(nonce, 1, crypto_secretbox_NONCEBYTES);
unsigned char *cipher; unsigned char *cipher;
size_t es = pcp_sodium_box(&cipher, message, messagesize, nonce, size_t es = pcp_sodium_box(&cipher, message, messagesize, nonce,
@@ -96,6 +100,12 @@ unsigned char *pcp_box_encrypt(pcp_key_t *secret, pcp_pubkey_t *public,
goto errbec; goto errbec;
} }
// scip
//fprintf(stderr, "public: "); pcpprint_bin(stderr, public->public, 32); fprintf(stderr, "\n");
//fprintf(stderr, "secret: "); pcpprint_bin(stderr, secret->secret, 32); fprintf(stderr, "\n");
//fprintf(stderr, "cipher: "); pcpprint_bin(stderr, cipher, es); fprintf(stderr, "\n");
//fprintf(stderr, " nonce: "); pcpprint_bin(stderr, nonce, crypto_secretbox_NONCEBYTES); fprintf(stderr, "\n");
// put nonce and cipher together // put nonce and cipher together
unsigned char *combined = ucmalloc(es + crypto_secretbox_NONCEBYTES); unsigned char *combined = ucmalloc(es + crypto_secretbox_NONCEBYTES);
memcpy(combined, nonce, crypto_secretbox_NONCEBYTES); memcpy(combined, nonce, crypto_secretbox_NONCEBYTES);

4
libpcp/ed.c
View File

@@ -78,7 +78,7 @@ pcp_sig_t *pcp_ed_newsig(unsigned char *hash, char *id) {
} }
pcp_sig_t *sig2native(pcp_sig_t *s) { pcp_sig_t *sig2native(pcp_sig_t *s) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return s; return s;
#else #else
s->version = be32toh(s->version); s->version = be32toh(s->version);
@@ -88,7 +88,7 @@ pcp_sig_t *sig2native(pcp_sig_t *s) {
} }
pcp_sig_t *sig2be(pcp_sig_t *s) { pcp_sig_t *sig2be(pcp_sig_t *s) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return s; return s;
#else #else
s->version = htobe32(s->version); s->version = htobe32(s->version);

8
libpcp/key.c
View File

@@ -228,7 +228,7 @@ unsigned char *pcpkey_getchecksum(pcp_key_t *k) {
pcp_key_t * key2be(pcp_key_t *k) { pcp_key_t * key2be(pcp_key_t *k) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return k; return k;
#else #else
uint32_t version = k->version; uint32_t version = k->version;
@@ -243,7 +243,7 @@ pcp_key_t * key2be(pcp_key_t *k) {
} }
pcp_key_t *key2native(pcp_key_t *k) { pcp_key_t *key2native(pcp_key_t *k) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return k; return k;
#else #else
k->version = be32toh(k->version); k->version = be32toh(k->version);
@@ -254,7 +254,7 @@ pcp_key_t *key2native(pcp_key_t *k) {
} }
pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k) { pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return k; return k;
#else #else
uint32_t version = k->version; uint32_t version = k->version;
@@ -269,7 +269,7 @@ pcp_pubkey_t * pubkey2be(pcp_pubkey_t *k) {
} }
pcp_pubkey_t *pubkey2native(pcp_pubkey_t *k) { pcp_pubkey_t *pubkey2native(pcp_pubkey_t *k) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return k; return k;
#else #else
k->version = be32toh(k->version); k->version = be32toh(k->version);

8
libpcp/vault.c
View File

@@ -358,7 +358,7 @@ int pcpvault_close(vault_t *vault) {
} }
vault_header_t * vh2be(vault_header_t *h) { vault_header_t * vh2be(vault_header_t *h) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return h; return h;
#else #else
h->version = htobe32(h->version); h->version = htobe32(h->version);
@@ -367,7 +367,7 @@ vault_header_t * vh2be(vault_header_t *h) {
} }
vault_header_t * vh2native(vault_header_t *h) { vault_header_t * vh2native(vault_header_t *h) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return h; return h;
#else #else
h->version = be32toh(h->version); h->version = be32toh(h->version);
@@ -376,7 +376,7 @@ vault_header_t * vh2native(vault_header_t *h) {
} }
vault_item_header_t * ih2be(vault_item_header_t *h) { vault_item_header_t * ih2be(vault_item_header_t *h) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return h; return h;
#else #else
h->version = htobe32(h->version); h->version = htobe32(h->version);
@@ -386,7 +386,7 @@ vault_item_header_t * ih2be(vault_item_header_t *h) {
} }
vault_item_header_t * ih2native(vault_item_header_t *h) { vault_item_header_t * ih2native(vault_item_header_t *h) {
#ifdef __BIG_ENDIAN #ifdef __CPU_IS_BIG_ENDIAN
return h; return h;
#else #else
h->version = be32toh(h->version); h->version = be32toh(h->version);

2
libpcp/z85.c
View File

@@ -145,7 +145,7 @@ char *pcp_z85_encode(unsigned char *raw, size_t srclen, size_t *dstlen) {
//fprintf(stderr, "z85block: <%s>\n", z85block); //fprintf(stderr, "z85block: <%s>\n", z85block);
*dstlen = blocklen; *dstlen = blocklen;
free(z85); free(z85);
free(padded); free(padded);
return z85block; return z85block;