Changeset 31

Show
Ignore:
Timestamp:
06/29/07 16:35:13 (17 months ago)
Author:
aj
Message:

random is a glibc function. use a different name.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • trunk/src/pam_p11.c

    r30 r31  
    8383        EVP_PKEY *pubkey; 
    8484 
    85         unsigned char random[RANDOM_SIZE]; 
     85        unsigned char rand_bytes[RANDOM_SIZE]; 
    8686        unsigned char signature[MAX_SIGSIZE]; 
    8787        int fd; 
     
    233233        } 
    234234 
    235         rv = read(fd, random, RANDOM_SIZE); 
     235        rv = read(fd, rand_bytes, RANDOM_SIZE); 
    236236        if (rv < 0) { 
    237237                syslog(LOG_ERR, "fatal: read from random source failed: "); 
     
    260260        /* ask for a sha1 hash of the random data, signed by the key */ 
    261261        siglen = MAX_SIGSIZE; 
    262         rv = PKCS11_sign(NID_sha1, random, RANDOM_SIZE, signature, &siglen, 
     262        rv = PKCS11_sign(NID_sha1, rand_bytes, RANDOM_SIZE, signature, &siglen, 
    263263                         authkey); 
    264264        if (rv != 1) { 
     
    277277 
    278278        /* now verify the result */ 
    279         rv = RSA_verify(NID_sha1, random, RANDOM_SIZE, 
     279        rv = RSA_verify(NID_sha1, rand_bytes, RANDOM_SIZE, 
    280280                        signature, siglen, pubkey->pkey.rsa); 
    281281        if (rv != 1) {