diff options
Diffstat (limited to 'plugins/MirOTR/libgcrypt-1.4.6')
| -rw-r--r-- | plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c | 4 | ||||
| -rw-r--r-- | plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c b/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c index 899dce89ad..aaf02a8f14 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c +++ b/plugins/MirOTR/libgcrypt-1.4.6/cipher/md5.c @@ -52,7 +52,7 @@ typedef struct { static void -md5_init( void *context ) +mir_md5_init( void *context ) { MD5_CONTEXT *ctx = context; @@ -350,6 +350,6 @@ static gcry_md_oid_spec_t oid_spec_md5[] = gcry_md_spec_t _gcry_digest_spec_md5 = { "MD5", asn, DIM (asn), oid_spec_md5, 16, - md5_init, md5_write, md5_final, md5_read, + mir_md5_init, md5_write, md5_final, md5_read, sizeof (MD5_CONTEXT) }; diff --git a/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c b/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c index 8862c64b0a..67cbaff3b3 100644 --- a/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c +++ b/plugins/MirOTR/libgcrypt-1.4.6/cipher/sha1.c @@ -66,7 +66,7 @@ typedef struct static void -sha1_init (void *context) +mir_sha1_init (void *context) { SHA1_CONTEXT *hd = context; @@ -367,7 +367,7 @@ _gcry_sha1_hash_buffer (void *outbuf, const void *buffer, size_t length) { SHA1_CONTEXT hd; - sha1_init (&hd); + mir_sha1_init (&hd); sha1_write (&hd, buffer, length); sha1_final (&hd); memcpy (outbuf, hd.buf, 20); @@ -469,7 +469,7 @@ static gcry_md_oid_spec_t oid_spec_sha1[] = gcry_md_spec_t _gcry_digest_spec_sha1 = { "SHA1", asn, DIM (asn), oid_spec_sha1, 20, - sha1_init, sha1_write, sha1_final, sha1_read, + mir_sha1_init, sha1_write, sha1_final, sha1_read, sizeof (SHA1_CONTEXT) }; md_extra_spec_t _gcry_digest_extraspec_sha1 = |