Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-29 02:51:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

added two additional non packward compatible changes for future version 0.7, and improvements of verifications of certificate signatures

Browse source
This commit is contained in:
csoler 2017-11-19 18:21:56 +01:00
parent 7472f78223
commit b4fdd4e0d0
8 changed files with 274 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openpgpsdk/src/openpgpsdk/packet.h
View file

@ -348,7 +348,10 @@ typedef enum
// SHA1 Hash Size \todo is this the same as OPS_CHECKHASH_SIZE??
#define OPS_SHA1_HASH_SIZE SHA_DIGEST_LENGTH
#define OPS_SHA224_HASH_SIZE SHA224_DIGEST_LENGTH
#define OPS_SHA256_HASH_SIZE SHA256_DIGEST_LENGTH
#define OPS_SHA384_HASH_SIZE SHA384_DIGEST_LENGTH
#define OPS_SHA512_HASH_SIZE SHA512_DIGEST_LENGTH
// Max hash size
#define OPS_MAX_HASH_SIZE 64

64
openpgpsdk/src/openpgpsdk/signature.c
View file

@ -216,8 +216,49 @@ static ops_boolean_t rsa_sign(ops_hash_t *hash, const ops_rsa_public_key_t *rsa,
unsigned t;
BIGNUM *bn;
int plen ;
unsigned int hash_length ;
unsigned char *prefix ;
switch(hash->algorithm)
{
case OPS_HASH_SHA1: hashsize=OPS_SHA1_HASH_SIZE+sizeof prefix_sha1;
hash_length=OPS_SHA1_HASH_SIZE ;
prefix = prefix_sha1;
plen = sizeof prefix_sha1 ;
break ;
case OPS_HASH_SHA224: hashsize=OPS_SHA224_HASH_SIZE+sizeof prefix_sha224;
hash_length=OPS_SHA224_HASH_SIZE ;
prefix = prefix_sha224;
plen = sizeof prefix_sha224 ;
break ;
case OPS_HASH_SHA256: hashsize=OPS_SHA256_HASH_SIZE+sizeof prefix_sha256;
hash_length=OPS_SHA256_HASH_SIZE ;
prefix = prefix_sha256;
plen = sizeof prefix_sha256 ;
break ;
case OPS_HASH_SHA384: hashsize=OPS_SHA384_HASH_SIZE+sizeof prefix_sha384;
hash_length=OPS_SHA384_HASH_SIZE ;
prefix = prefix_sha384;
plen = sizeof prefix_sha384 ;
break ;
case OPS_HASH_SHA512: hashsize=OPS_SHA512_HASH_SIZE+sizeof prefix_sha512;
hash_length=OPS_SHA512_HASH_SIZE ;
prefix = prefix_sha512;
plen = sizeof prefix_sha512 ;
break ;
case OPS_HASH_MD5: fprintf(stderr,"(insecure) MD5+RSA signatures not supported in RSA sign") ;
return ops_false ;
default: fprintf(stderr,"Hash algorithm %d not supported in RSA sign",hash->algorithm) ;
return ops_false ;
}
// XXX: we assume hash is sha-1 for now
hashsize=20+sizeof prefix_sha1;
keysize=BN_num_bytes(rsa->n);
@ -240,12 +281,12 @@ static ops_boolean_t rsa_sign(ops_hash_t *hash, const ops_rsa_public_key_t *rsa,
hashbuf[n]=0xff;
hashbuf[n++]=0;
memcpy(&hashbuf[n], prefix_sha1, sizeof prefix_sha1);
n+=sizeof prefix_sha1;
memcpy(&hashbuf[n], prefix, plen);
n+=plen;
t=hash->finish(hash, &hashbuf[n]);
if(t != 20)
if(t != hash_length)
{
fprintf(stderr,"Wrong hash size. Should be 20! can't sign.") ;
return ops_false ;
@ -1376,12 +1417,13 @@ void example(const ops_secret_key_t *skey)
\endcode
*/
ops_memory_t* ops_sign_buf(const void* input, const size_t input_len,
const ops_sig_type_t sig_type,
const ops_secret_key_t *skey,
const ops_boolean_t use_armour,
ops_boolean_t include_data,
ops_boolean_t include_creation_time,
ops_boolean_t include_key_id)
const ops_sig_type_t sig_type,
const ops_hash_algorithm_t hash_algorithm,
const ops_secret_key_t *skey,
const ops_boolean_t use_armour,
ops_boolean_t include_data,
ops_boolean_t include_creation_time,
ops_boolean_t include_key_id)
{
// \todo allow choice of hash algorithams
// enforce use of SHA1 for now
@ -1392,7 +1434,7 @@ ops_memory_t* ops_sign_buf(const void* input, const size_t input_len,
ops_create_info_t *cinfo=NULL;
ops_memory_t *mem=ops_memory_new();
ops_hash_algorithm_t hash_alg=OPS_HASH_SHA1;
ops_hash_algorithm_t hash_alg=hash_algorithm ;
ops_literal_data_type_t ld_type;
ops_hash_t* hash=NULL;

2
openpgpsdk/src/openpgpsdk/signature.h
View file

@ -90,7 +90,7 @@ void ops_signature_add_primary_user_id(ops_create_signature_t *sig,
ops_boolean_t ops_sign_file_as_cleartext(const char* input_filename, const char* output_filename, const ops_secret_key_t *skey, const ops_boolean_t overwrite);
ops_boolean_t ops_sign_buf_as_cleartext(const char* input, const size_t len, ops_memory_t** output, const ops_secret_key_t *skey);
ops_boolean_t ops_sign_file(const char* input_filename, const char* output_filename, const ops_secret_key_t *skey, const ops_boolean_t use_armour, const ops_boolean_t overwrite);
ops_memory_t * ops_sign_buf(const void* input, const size_t input_len, const ops_sig_type_t sig_type, const ops_secret_key_t *skey, const ops_boolean_t use_armour,ops_boolean_t include_data,ops_boolean_t include_creation_time,ops_boolean_t include_key_id);
ops_memory_t * ops_sign_buf(const void* input, const size_t input_len, const ops_sig_type_t sig_type, const ops_hash_algorithm_t hash_algorithm, const ops_secret_key_t *skey, const ops_boolean_t use_armour, ops_boolean_t include_data, ops_boolean_t include_creation_time, ops_boolean_t include_key_id);
ops_boolean_t ops_writer_push_signed(ops_create_info_t *cinfo, const ops_sig_type_t sig_type, const ops_secret_key_t *skey);
#endif