Changeset 571

Show
Ignore:
Timestamp:
07/29/08 16:03:40
Author:
rachel
Message:

Added version number.
Make armoured keys have line breaks.
Use decrypted secret key when needed.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • openpgpsdk/trunk/include/openpgpsdk/version.h

    r570 r571  
    2222#define OPS_VERSION_MAJOR       0 
    2323/* Set to the version next to be released */ 
    24 #define OPS_VERSION_MINOR       0 
     24#define OPS_VERSION_MINOR       5 
    2525/* 0 for development version, 1 for release */ 
    2626#define OPS_VERSION_RELEASE     0 

  • openpgpsdk/trunk/src/app/openpgp.c

    r570 r571  
    149149    ops_validate_result_t *validate_result=NULL; 
    150150    ops_user_id_t uid; 
     151    //char line[maxbuf+1]; 
     152    //int i=0; 
     153    ops_secret_key_t* skey=NULL; 
    151154 
    152155    memset(opt_keyring,'\0',sizeof(opt_keyring)); 
    …… 
    508511            exit(-1); 
    509512            } 
     513        // now decrypt key 
     514        // \todo 
     515        //fprintf(stdout, "Enter passphrase: "); 
     516        skey=ops_decrypt_secret_key_from_data(keydata,opt_passphrase); 
     517        assert(skey); 
    510518 
    511519        // sign file 
    512520        overwrite=ops_true; 
    513         ops_sign_file(opt_filename, NULL, &keydata->key.skey, armour, overwrite); 
     521        ops_sign_file(opt_filename, NULL, skey, armour, overwrite); 
    514522        break; 
    515523 
    …… 
    529537            exit(-1); 
    530538            } 
     539        skey=ops_decrypt_secret_key_from_data(keydata,opt_passphrase); 
     540        assert(skey); 
    531541 
    532542        // sign file 
    533543        overwrite=ops_true; 
    534         ops_sign_file_as_cleartext(opt_filename, &keydata->key.skey, overwrite); 
     544        ops_sign_file_as_cleartext(opt_filename, skey, overwrite); 
    535545        break; 
    536546 

  • openpgpsdk/trunk/src/lib/adv_armour.c

    r570 r571  
    12521252    ops_write(header,sz_hdr,info); 
    12531253 
     1254    ops_writer_push(info,linebreak_writer,NULL,ops_writer_generic_destroyer, 
     1255                    ops_mallocz(sizeof(linebreak_arg_t))); 
     1256 
    12541257    base64_arg_t *arg=ops_mallocz(sizeof *arg); 
    1255  
    12561258    arg->checksum=CRC24_INIT; 
    12571259    ops_writer_push(info,base64_writer,finaliser,ops_writer_generic_destroyer,arg); 

  • openpgpsdk/trunk/src/lib/adv_openssl_crypto.c

    r570 r571  
    202202    /* debug */ 
    203203    orsa->e=rsa->e; 
     204    // If this isn't set, it's very likely that the programmer hasn't 
     205    // decrypted the secret key. RSA_check_key segfaults in that case. 
     206    // Use ops_decrypt_secret_key_from_data() to do that. 
     207    assert(orsa->d); 
    204208    assert(RSA_check_key(orsa) == 1); 
    205209    orsa->e=NULL; 

  • openpgpsdk/trunk/src/lib/adv_signature.c

    r570 r571  
    160160    unsigned t; 
    161161    BIGNUM *bn; 
    162  
    163162 
    164163    // XXX: we assume hash is sha-1 for now 
    …… 
    665664    size_t l=ops_memory_get_length(sig->mem); 
    666665 
     666    assert(skey->key.rsa.d); // key not decrypted 
     667 
    667668    assert(sig->hashed_data_length != (unsigned)-1); 
    668669 

  • openpgpsdk/trunk/tests/tests.c

    r570 r571  
    4545        return CU_get_error(); 
    4646        } 
     47 
    4748    if (NULL == suite_crypto()) 
    4849        { 
    …… 
    7172        return CU_get_error(); 
    7273        } 
     74 
    7375    if (NULL == suite_rsa_signature())  
    7476        { 
    …… 
    7779        return CU_get_error(); 
    7880        } 
     81 
    7982    if (NULL == suite_rsa_verify())  
    8083        {