eion/purple-hangouts

Make sure we don't double-define PurpleHash if we're using both sha1 and sha256
draft
2017-04-21, Eion Robb
22251e5bfb4e
Parents 6684fd566561
Children 1bba72ca5c42
Make sure we don't double-define PurpleHash if we're using both sha1 and sha256
1 files changed, 9 insertions(+), 4 deletions(-)
  • +9 -4
    purple2compat/ciphers/sha1hash.h
    • --- a/purple2compat/ciphers/sha1hash.h Fri Apr 21 18:29:19 2017 +1200
    +++ b/purple2compat/ciphers/sha1hash.h Fri Apr 21 18:29:48 2017 +1200
    @@ -3,11 +3,16 @@
    #include "cipher.h"
    -#define PurpleHash PurpleCipherContext
    #define purple_sha1_hash_new() purple_cipher_context_new(purple_ciphers_find_cipher("sha1"), NULL)
    -#define purple_hash_append purple_cipher_context_append
    -#define purple_hash_digest_to_str(ctx, data, size) \
    +
    +#ifndef PurpleHash
    +# define PurpleHash PurpleCipherContext
    +# define purple_hash_append purple_cipher_context_append
    +# define purple_hash_digest_to_str(ctx, data, size) \
    purple_cipher_context_digest_to_str(ctx, size, data, NULL)
    -#define purple_hash_destroy purple_cipher_context_destroy
    +# define purple_hash_digest(ctx, data, size) \
    + purple_cipher_context_digest(ctx, size, data, NULL)
    +# define purple_hash_destroy purple_cipher_context_destroy
    +#endif /*PurpleHash*/
    #endif /*_CIPHERS_SHA1HASH_H_*/