diff options
| author | Fabiano Fidêncio <fidencio@redhat.com> | 2015-09-17 13:47:00 +0200 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-10-12 13:56:21 +0200 |
| commit | 62fe4e426f08e0ba4c40c6b379e792883a4e6ae3 (patch) | |
| tree | 50675d437198b9956e7f90c11ad26a089fbe9c46 | |
| parent | 7703f9dc847a5906e852c5c3599f6c2ebf062968 (diff) | |
| download | libssh-62fe4e426f08e0ba4c40c6b379e792883a4e6ae3.tar.gz libssh-62fe4e426f08e0ba4c40c6b379e792883a4e6ae3.tar.xz libssh-62fe4e426f08e0ba4c40c6b379e792883a4e6ae3.zip | |
cleanup: use ssh_ prefix in the gcrypt missing functions
Having "ssh_" prefix in the functions' name will avoid possible clashes
when compiling libssh statically.
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
| -rw-r--r-- | include/libssh/libgcrypt.h | 8 | ||||
| -rw-r--r-- | src/gcrypt_missing.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/libssh/libgcrypt.h b/include/libssh/libgcrypt.h index 8e52a681..7b97c7f8 100644 --- a/include/libssh/libgcrypt.h +++ b/include/libssh/libgcrypt.h @@ -52,15 +52,15 @@ typedef void *EVPCTX; typedef gcry_mpi_t bignum; /* missing gcrypt functions */ -int my_gcry_dec2bn(bignum *bn, const char *data); -char *my_gcry_bn2dec(bignum bn); +int ssh_gcry_dec2bn(bignum *bn, const char *data); +char *ssh_gcry_bn2dec(bignum bn); #define bignum_new() gcry_mpi_new(0) #define bignum_free(num) gcry_mpi_release(num) #define bignum_set_word(bn,n) gcry_mpi_set_ui(bn,n) #define bignum_bin2bn(bn,datalen,data) gcry_mpi_scan(data,GCRYMPI_FMT_USG,bn,datalen,NULL) -#define bignum_bn2dec(num) my_gcry_bn2dec(num) -#define bignum_dec2bn(num, data) my_gcry_dec2bn(data, num) +#define bignum_bn2dec(num) ssh_gcry_bn2dec(num) +#define bignum_dec2bn(num, data) ssh_gcry_dec2bn(data, num) #define bignum_bn2hex(num,data) gcry_mpi_aprint(GCRYMPI_FMT_HEX,data,NULL,num) #define bignum_hex2bn(num,datalen,data) gcry_mpi_scan(num,GCRYMPI_FMT_HEX,data,datalen,NULL) #define bignum_rand(num,bits) gcry_mpi_randomize(num,bits,GCRY_STRONG_RANDOM),gcry_mpi_set_bit(num,bits-1),gcry_mpi_set_bit(num,0) diff --git a/src/gcrypt_missing.c b/src/gcrypt_missing.c index b21e5f30..e07843b8 100644 --- a/src/gcrypt_missing.c +++ b/src/gcrypt_missing.c @@ -27,7 +27,7 @@ #include "libssh/libgcrypt.h" #ifdef HAVE_LIBGCRYPT -int my_gcry_dec2bn(bignum *bn, const char *data) { +int ssh_gcry_dec2bn(bignum *bn, const char *data) { int count; *bn = bignum_new(); @@ -43,7 +43,7 @@ int my_gcry_dec2bn(bignum *bn, const char *data) { return count; } -char *my_gcry_bn2dec(bignum bn) { +char *ssh_gcry_bn2dec(bignum bn) { bignum bndup, num, ten; char *ret; int count, count2; |