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

added pcpstream usage to signature lib code as well

Browse Source
This commit is contained in:
TLINDEN
2014-02-15 17:39:16 +01:00
parent e78269fceb
commit cf8402aec0
6 changed files with 116 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bindings/cpp/sign++.h
View File

@@ -43,6 +43,7 @@ namespace pcp {
Key S; Key S;
Vault vault; Vault vault;
unsigned char *sig; unsigned char *sig;
PubKey Signedby;
// constructors // constructors
Signature(Key &skey); // sign only Signature(Key &skey); // sign only
@@ -57,6 +58,7 @@ namespace pcp {
// sender pubkey is P // sender pubkey is P
unsigned char *sign(std::vector<unsigned char> message); unsigned char *sign(std::vector<unsigned char> message);
unsigned char *sign(unsigned char *message, size_t mlen); unsigned char *sign(unsigned char *message, size_t mlen);
unsigned char *sign(Pcpstream *message);
// verify using P or use vault if defined // verify using P or use vault if defined
bool verify(std::vector<unsigned char> message); bool verify(std::vector<unsigned char> message);

67
bindings/cpp/sign.cpp
View File

@@ -56,10 +56,27 @@ Signature::~Signature() {
} }
unsigned char *Signature::sign(std::vector<unsigned char> message) { unsigned char *Signature::sign(std::vector<unsigned char> message) {
unsigned char *m = (unsigned char *)ucmalloc(message.size()); if(! S)
throw exception("Error: cannot sign without a secret key, use another constructor.");
if(S.is_encrypted())
throw exception("Error: cannot sign with an encrypted secret key, decrypt it before using.");
char n[] = "signvec";
Buffer *m = buffer_new(32, n);
for(size_t i=0; i<message.size(); ++i) for(size_t i=0; i<message.size(); ++i)
m[i] = message[i]; buffer_add(m, (void *)message[i], 1);
return Signature::sign(m, message.size());
Pcpstream *p = ps_new_inbuffer(m);
unsigned char *sig = Signature::sign(p);
ps_close(p);
buffer_free(m);
if(sig == NULL)
throw exception();
return sig;
} }
unsigned char *Signature::sign(unsigned char *message, size_t mlen) { unsigned char *Signature::sign(unsigned char *message, size_t mlen) {
@@ -69,7 +86,14 @@ unsigned char *Signature::sign(unsigned char *message, size_t mlen) {
if(S.is_encrypted()) if(S.is_encrypted())
throw exception("Error: cannot sign with an encrypted secret key, decrypt it before using."); throw exception("Error: cannot sign with an encrypted secret key, decrypt it before using.");
sig = pcp_ed_sign(message, mlen, S.K); char n[] = "signchar";
Buffer *m = buffer_new(32, n);
buffer_add(m, message, mlen);
Pcpstream *p = ps_new_inbuffer(m);
unsigned char *sig = Signature::sign(p);
ps_close(p);
buffer_free(m);
if(sig == NULL) if(sig == NULL)
throw exception(); throw exception();
@@ -77,6 +101,25 @@ unsigned char *Signature::sign(unsigned char *message, size_t mlen) {
return sig; return sig;
} }
unsigned char *Signature::sign(Pcpstream *message) {
Pcpstream *out = ps_new_outbuffer();
unsigned char *sig = NULL;
size_t sigsize = pcp_ed_sign_buffered(message, out, S.K, 1);
if(sigsize > 0) {
Buffer *o = ps_buffer(out);
sigsize = buffer_size(o);
buffer_dump(o);
sig = (unsigned char*)ucmalloc(sigsize);
buffer_get_chunk(o, sig, sigsize);
}
ps_close(out);
return sig;
}
bool Signature::verify(vector<unsigned char> message) { bool Signature::verify(vector<unsigned char> message) {
unsigned char *m = (unsigned char *)ucmalloc(message.size()); unsigned char *m = (unsigned char *)ucmalloc(message.size());
for(size_t i=0; i<message.size(); ++i) for(size_t i=0; i<message.size(); ++i)
@@ -87,14 +130,22 @@ bool Signature::verify(vector<unsigned char> message) {
} }
bool Signature::verify(unsigned char *signature, size_t mlen) { bool Signature::verify(unsigned char *signature, size_t mlen) {
unsigned char *message;
if(!P) { if(!P) {
throw exception("No public key specified, unable to verify."); throw exception("No public key specified, unable to verify.");
} }
message = pcp_ed_verify(signature, mlen, P.K); char n[] = "verify";
if(message != NULL) { Buffer *m = buffer_new(32, n);
buffer_add(m, signature, mlen);
Pcpstream *p = ps_new_inbuffer(m);
pcp_pubkey_t *pub = pcp_ed_verify_buffered(p, P.K);
ps_close(p);
if(pub != NULL) {
Signedby = PubKey(pub);
return true; return true;
} }
else { else {

9
include/pcp/ed.h
View File

@@ -37,6 +37,7 @@
#include "key.h" #include "key.h"
#include "keyhash.h" #include "keyhash.h"
#include "util.h" #include "util.h"
#include "pcpstream.h"
/* sign a message of messagesize using s->edsecret, if it works /* sign a message of messagesize using s->edsecret, if it works
return message+signature (size: messagesize + crypto_sign_BYTES), return message+signature (size: messagesize + crypto_sign_BYTES),
@@ -57,11 +58,11 @@ unsigned char *pcp_ed_verify_key(unsigned char *signature, size_t siglen, pcp_pu
/* same as pcp_ed_sign() but work on i/o directly, we're making a hash /* same as pcp_ed_sign() but work on i/o directly, we're making a hash
of the input 32k-wise, copy in=>out, sign the hash and append the of the input 32k-wise, copy in=>out, sign the hash and append the
sig only to the output */ sig only to the output */
size_t pcp_ed_sign_buffered(FILE *in, FILE *out, pcp_key_t *s, int z85); size_t pcp_ed_sign_buffered(Pcpstream *in, Pcpstream *out, pcp_key_t *s, int z85);
pcp_pubkey_t *pcp_ed_verify_buffered(FILE *in, pcp_pubkey_t *p); pcp_pubkey_t *pcp_ed_verify_buffered(Pcpstream *in, pcp_pubkey_t *p);
size_t pcp_ed_detachsign_buffered(FILE *in, FILE *out, pcp_key_t *s); size_t pcp_ed_detachsign_buffered(Pcpstream *in, Pcpstream *out, pcp_key_t *s);
pcp_pubkey_t *pcp_ed_detachverify_buffered(FILE *in, FILE *sigfd, pcp_pubkey_t *p); pcp_pubkey_t *pcp_ed_detachverify_buffered(Pcpstream *in, Pcpstream *sigfd, pcp_pubkey_t *p);
#endif /* _HAVE_PCP_ED_H */ #endif /* _HAVE_PCP_ED_H */

65
libpcp/ed.c
View File

@@ -38,7 +38,7 @@ unsigned char * pcp_ed_verify_key(unsigned char *signature, size_t siglen, pcp_p
} }
unsigned char * pcp_ed_verify(unsigned char *signature, size_t siglen, pcp_pubkey_t *p) { unsigned char * pcp_ed_verify(unsigned char *signature, size_t siglen, pcp_pubkey_t *p) {
unsigned char *message = ucmalloc(siglen - crypto_sign_BYTES); unsigned char *message = ucmalloc(siglen); /* we alloc the full size, the resulting len will be returned by nacl anyway - crypto_sign_BYTES); */
unsigned long long mlen; unsigned long long mlen;
if(crypto_sign_open(message, &mlen, signature, siglen, p->edpub) != 0) { if(crypto_sign_open(message, &mlen, signature, siglen, p->edpub) != 0) {
@@ -71,7 +71,7 @@ unsigned char *pcp_ed_sign(unsigned char *message, size_t messagesize, pcp_key_t
return signature; return signature;
} }
size_t pcp_ed_sign_buffered(FILE *in, FILE *out, pcp_key_t *s, int z85) { size_t pcp_ed_sign_buffered(Pcpstream *in, Pcpstream* out, pcp_key_t *s, int z85) {
unsigned char in_buf[PCP_BLOCK_SIZE]; unsigned char in_buf[PCP_BLOCK_SIZE];
size_t cur_bufsize = 0; size_t cur_bufsize = 0;
size_t outsize = 0; size_t outsize = 0;
@@ -81,18 +81,18 @@ size_t pcp_ed_sign_buffered(FILE *in, FILE *out, pcp_key_t *s, int z85) {
crypto_generichash_init(st, NULL, 0, 0); crypto_generichash_init(st, NULL, 0, 0);
if(z85) if(z85)
fprintf(out, "%s\nHash: Blake2\n\n", PCP_SIG_HEADER); ps_print(out, "%s\nHash: Blake2\n\n", PCP_SIG_HEADER);
while(!feof(in)) { while(!ps_end(in)) {
cur_bufsize = fread(&in_buf, 1, PCP_BLOCK_SIZE, in); cur_bufsize = ps_read(in, &in_buf, PCP_BLOCK_SIZE); /* fread(&in_buf, 1, PCP_BLOCK_SIZE, in); */
if(cur_bufsize <= 0) if(cur_bufsize <= 0)
break; break;
outsize += cur_bufsize; outsize += cur_bufsize;
crypto_generichash_update(st, in_buf, cur_bufsize); crypto_generichash_update(st, in_buf, cur_bufsize);
fwrite(in_buf, cur_bufsize, 1, out); ps_write(out, in_buf, cur_bufsize); /* fwrite(in_buf, cur_bufsize, 1, out); */
} }
if(ferror(out) != 0) { if(ps_err(out) != 0) {
fatal("Failed to write encrypted output!\n"); fatal("Failed to write encrypted output!\n");
free(st); free(st);
return 0; return 0;
@@ -104,27 +104,22 @@ size_t pcp_ed_sign_buffered(FILE *in, FILE *out, pcp_key_t *s, int z85) {
size_t mlen = + crypto_sign_BYTES + crypto_generichash_BYTES_MAX; size_t mlen = + crypto_sign_BYTES + crypto_generichash_BYTES_MAX;
if(z85) { if(z85) {
fprintf(out, "\n%s\n Version: PCP v%d.%d.%d\n\n", PCP_SIG_START, PCP_VERSION_MAJOR, PCP_VERSION_MINOR, PCP_VERSION_PATCH); ps_print(out, "\n%s\n Version: PCP v%d.%d.%d\n\n", PCP_SIG_START, PCP_VERSION_MAJOR, PCP_VERSION_MINOR, PCP_VERSION_PATCH);
size_t zlen; size_t zlen;
char *z85encoded = pcp_z85_encode((unsigned char*)signature, mlen, &zlen); char *z85encoded = pcp_z85_encode((unsigned char*)signature, mlen, &zlen);
fprintf(out, "%s\n%s\n", z85encoded, PCP_SIG_END); ps_print(out, "%s\n%s\n", z85encoded, PCP_SIG_END);
} }
else { else {
fprintf(out, "%s", PCP_SIGPREFIX); ps_print(out, "%s", PCP_SIGPREFIX);
fwrite(signature, mlen, 1, out); ps_write(out, signature, mlen); /* fwrite(signature, mlen, 1, out); */
} }
if(fileno(in) != 0)
fclose(in);
if(fileno(out) != 1)
fclose(out);
free(st); free(st);
return outsize; return outsize;
} }
pcp_pubkey_t *pcp_ed_verify_buffered(FILE *in, pcp_pubkey_t *p) { pcp_pubkey_t *pcp_ed_verify_buffered(Pcpstream *in, pcp_pubkey_t *p) {
unsigned char in_buf[PCP_BLOCK_SIZE/2]; unsigned char in_buf[PCP_BLOCK_SIZE/2];
unsigned char in_next[PCP_BLOCK_SIZE/2]; unsigned char in_next[PCP_BLOCK_SIZE/2];
unsigned char in_full[PCP_BLOCK_SIZE]; unsigned char in_full[PCP_BLOCK_SIZE];
@@ -154,7 +149,7 @@ pcp_pubkey_t *pcp_ed_verify_buffered(FILE *in, pcp_pubkey_t *p) {
crypto_generichash_init(st, NULL, 0, 0); crypto_generichash_init(st, NULL, 0, 0);
/* use two half blocks, to overcome sigs spanning block boundaries */ /* use two half blocks, to overcome sigs spanning block boundaries */
cur_bufsize = fread(&in_buf, 1, PCP_BLOCK_SIZE/2, in); cur_bufsize = ps_read(in, &in_buf, PCP_BLOCK_SIZE/2); /* fread(&in_buf, 1, PCP_BLOCK_SIZE/2, in); */
/* look for z85 header and cut it out */ /* look for z85 header and cut it out */
if(_findoffset(in_buf, cur_bufsize, zhead, hlen) == 0) { if(_findoffset(in_buf, cur_bufsize, zhead, hlen) == 0) {
@@ -164,7 +159,8 @@ pcp_pubkey_t *pcp_ed_verify_buffered(FILE *in, pcp_pubkey_t *p) {
memcpy(in_buf, in_next, next_bufsize); /* put into inbuf without header */ memcpy(in_buf, in_next, next_bufsize); /* put into inbuf without header */
if(cur_bufsize == PCP_BLOCK_SIZE/2) { if(cur_bufsize == PCP_BLOCK_SIZE/2) {
/* more to come */ /* more to come */
cur_bufsize = fread(&in_buf[next_bufsize], 1, ((PCP_BLOCK_SIZE/2) - next_bufsize), in); cur_bufsize = ps_read(in, &in_buf[next_bufsize], ((PCP_BLOCK_SIZE/2) - next_bufsize));
/* cur_bufsize = fread(&in_buf[next_bufsize], 1, ((PCP_BLOCK_SIZE/2) - next_bufsize), in); */
cur_bufsize += next_bufsize; cur_bufsize += next_bufsize;
next_bufsize = 0; next_bufsize = 0;
/* now we've got the 1st half block in in_buf */ /* now we've got the 1st half block in in_buf */
@@ -189,7 +185,7 @@ pcp_pubkey_t *pcp_ed_verify_buffered(FILE *in, pcp_pubkey_t *p) {
while (cur_bufsize > 0) { while (cur_bufsize > 0) {
if(cur_bufsize == PCP_BLOCK_SIZE/2) { if(cur_bufsize == PCP_BLOCK_SIZE/2) {
/* probably not eof */ /* probably not eof */
next_bufsize = fread(&in_next, 1, PCP_BLOCK_SIZE/2, in); next_bufsize = ps_read(in, &in_next, PCP_BLOCK_SIZE/2); /* fread(&in_next, 1, PCP_BLOCK_SIZE/2, in); */
} }
else else
next_bufsize = 0; /* <= this is eof */ next_bufsize = 0; /* <= this is eof */
@@ -302,7 +298,7 @@ pcp_pubkey_t *pcp_ed_verify_buffered(FILE *in, pcp_pubkey_t *p) {
return NULL; return NULL;
} }
size_t pcp_ed_detachsign_buffered(FILE *in, FILE *out, pcp_key_t *s) { size_t pcp_ed_detachsign_buffered(Pcpstream *in, Pcpstream *out, pcp_key_t *s) {
unsigned char in_buf[PCP_BLOCK_SIZE]; unsigned char in_buf[PCP_BLOCK_SIZE];
size_t cur_bufsize = 0; size_t cur_bufsize = 0;
size_t outsize = 0; size_t outsize = 0;
@@ -311,8 +307,8 @@ size_t pcp_ed_detachsign_buffered(FILE *in, FILE *out, pcp_key_t *s) {
crypto_generichash_init(st, NULL, 0, 0); crypto_generichash_init(st, NULL, 0, 0);
while(!feof(in)) { while(!ps_end(in)) {
cur_bufsize = fread(&in_buf, 1, PCP_BLOCK_SIZE, in); cur_bufsize = ps_read(in, &in_buf, PCP_BLOCK_SIZE); /* fread(&in_buf, 1, PCP_BLOCK_SIZE, in); */
if(cur_bufsize <= 0) if(cur_bufsize <= 0)
break; break;
outsize += cur_bufsize; outsize += cur_bufsize;
@@ -324,23 +320,18 @@ size_t pcp_ed_detachsign_buffered(FILE *in, FILE *out, pcp_key_t *s) {
unsigned char *signature = pcp_ed_sign(hash, crypto_generichash_BYTES_MAX, s); unsigned char *signature = pcp_ed_sign(hash, crypto_generichash_BYTES_MAX, s);
size_t mlen = + crypto_sign_BYTES + crypto_generichash_BYTES_MAX; size_t mlen = + crypto_sign_BYTES + crypto_generichash_BYTES_MAX;
fprintf(out, "\n%s\n Version: PCP v%d.%d.%d\n\n", ps_print(out, "\n%s\n Version: PCP v%d.%d.%d\n\n",
PCP_SIG_START, PCP_VERSION_MAJOR, PCP_VERSION_MINOR, PCP_VERSION_PATCH); PCP_SIG_START, PCP_VERSION_MAJOR, PCP_VERSION_MINOR, PCP_VERSION_PATCH);
size_t zlen; size_t zlen;
char *z85encoded = pcp_z85_encode((unsigned char*)signature, mlen, &zlen); char *z85encoded = pcp_z85_encode((unsigned char*)signature, mlen, &zlen);
fprintf(out, "%s\n%s\n", z85encoded, PCP_SIG_END); ps_print(out, "%s\n%s\n", z85encoded, PCP_SIG_END);
if(fileno(in) != 0)
fclose(in);
if(fileno(out) != 1)
fclose(out);
free(st); free(st);
return outsize; return outsize;
} }
pcp_pubkey_t *pcp_ed_detachverify_buffered(FILE *in, FILE *sigfd, pcp_pubkey_t *p) { pcp_pubkey_t *pcp_ed_detachverify_buffered(Pcpstream *in, Pcpstream *sigfd, pcp_pubkey_t *p) {
unsigned char in_buf[PCP_BLOCK_SIZE]; unsigned char in_buf[PCP_BLOCK_SIZE];
size_t cur_bufsize = 0; size_t cur_bufsize = 0;
size_t outsize = 0; size_t outsize = 0;
@@ -350,8 +341,8 @@ pcp_pubkey_t *pcp_ed_detachverify_buffered(FILE *in, FILE *sigfd, pcp_pubkey_t *
crypto_generichash_init(st, NULL, 0, 0); crypto_generichash_init(st, NULL, 0, 0);
while(!feof(in)) { while(!ps_end(in)) {
cur_bufsize = fread(&in_buf, 1, PCP_BLOCK_SIZE, in); cur_bufsize = ps_read(in, &in_buf, PCP_BLOCK_SIZE); /* fread(&in_buf, 1, PCP_BLOCK_SIZE, in); */
if(cur_bufsize <= 0) if(cur_bufsize <= 0)
break; break;
outsize += cur_bufsize; outsize += cur_bufsize;
@@ -365,15 +356,17 @@ pcp_pubkey_t *pcp_ed_detachverify_buffered(FILE *in, FILE *sigfd, pcp_pubkey_t *
size_t inputBufSize = 0; size_t inputBufSize = 0;
unsigned char byte[1]; unsigned char byte[1];
while(!feof(sigfd)) { while(!ps_end(sigfd)) {
if(!fread(&byte, 1, 1, sigfd)) if(!ps_read(sigfd, &byte, 1))
break; break;
/*
if(!fread(&byte, 1, 1, sigfd))
break;*/
unsigned char *tmp = realloc(sig, inputBufSize + 1); unsigned char *tmp = realloc(sig, inputBufSize + 1);
sig = tmp; sig = tmp;
memmove(&sig[inputBufSize], byte, 1); memmove(&sig[inputBufSize], byte, 1);
inputBufSize ++; inputBufSize ++;
} }
fclose(sigfd);
if(sig == NULL) { if(sig == NULL) {
fatal("Invalid detached signature\n"); fatal("Invalid detached signature\n");

26
src/signature.c
View File

@@ -71,11 +71,17 @@ int pcpsign(char *infile, char *outfile, char *passwd, int z85, int detach) {
goto errs1; goto errs1;
} }
Pcpstream *pin = ps_new_file(in);
Pcpstream *pout = ps_new_file(out);
size_t sigsize; size_t sigsize;
if(detach == 1) if(detach == 1)
sigsize = pcp_ed_detachsign_buffered(in, out, secret); sigsize = pcp_ed_detachsign_buffered(pin, pout, secret);
else else
sigsize = pcp_ed_sign_buffered(in, out, secret, z85); sigsize = pcp_ed_sign_buffered(pin, pout, secret, z85);
ps_close(pin);
ps_close(pout);
if(sigsize == 0) if(sigsize == 0)
goto errs1; goto errs1;
@@ -111,11 +117,19 @@ int pcpverify(char *infile, char *sigfile, char *id, int detach) {
if(id != NULL) if(id != NULL)
HASH_FIND_STR(pcppubkey_hash, id, pub); HASH_FIND_STR(pcppubkey_hash, id, pub);
if(detach) Pcpstream *pin = ps_new_file(in);
pub = pcp_ed_detachverify_buffered(in, sigfd, pub);
if(detach) {
Pcpstream *psigfd = ps_new_file(sigfd);
pub = pcp_ed_detachverify_buffered(pin, psigfd, pub);
ps_close(psigfd);
}
else else
pub = pcp_ed_verify_buffered(in, pub); pub = pcp_ed_verify_buffered(pin, pub);
ps_close(pin);
if(pub != NULL) if(pub != NULL)
fprintf(stderr, "Signature verified (signed by %s <%s>).\n", pub->owner, pub->mail); fprintf(stderr, "Signature verified (signed by %s <%s>).\n", pub->owner, pub->mail);

1
src/signature.h
View File

@@ -31,6 +31,7 @@
#include "pcp.h" #include "pcp.h"
#include "uthash.h" #include "uthash.h"
#include "z85.h" #include "z85.h"
#include "pcpstream.h"
int pcpsign(char *infile, char *outfile, char *passwd, int z85, int detach); int pcpsign(char *infile, char *outfile, char *passwd, int z85, int detach);
int pcpverify(char *infile, char *sigfile, char *id, int detach); int pcpverify(char *infile, char *sigfile, char *id, int detach);