gobjectification: c4f372a2: removed the [gs]et_hash methods from Pur...

grim at pidgin.im grim at pidgin.im
Sun Jul 19 14:25:22 EDT 2009


-----------------------------------------------------------------
Revision: c4f372a2fd5dcdb458bee92c82231d3bf0e6c8e3
Ancestor: 82ceb602afedcfbe58a2408d01852e2a444c4720
Author: grim at pidgin.im
Date: 2009-07-19T17:50:34
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/c4f372a2fd5dcdb458bee92c82231d3bf0e6c8e3

Modified files:
        libpurple/cipher.c libpurple/cipher.h

ChangeLog: 

removed the [gs]et_hash methods from PurpleCipher, they now live where they're needed in PurpleHMACCipher


-------------- next part --------------
============================================================
--- libpurple/cipher.c	6831530ce7ef83b5b4fcaea91772dfdee0f24e61
+++ libpurple/cipher.c	2bc190daf88a7cb21818ef59ead07b22c6fc39c4
@@ -320,32 +320,3 @@ purple_cipher_set_key_with_len(PurpleCip
 		klass->set_key_with_len(cipher, key, len);
 }
 
-void
-purple_cipher_set_hash(PurpleCipher *cipher,
-					   PurpleCipher *hash)
-{
-	PurpleCipherClass *klass = NULL;
-
-	g_return_if_fail(PURPLE_IS_CIPHER(cipher));
-	g_return_if_fail(PURPLE_IS_CIPHER(hash));
-
-	klass = PURPLE_CIPHER_GET_CLASS(cipher);
-
-	if(klass && klass->set_hash)
-		klass->set_hash(cipher, hash);
-}
-
-PurpleCipher *
-purple_cipher_get_hash(PurpleCipher *cipher)
-{
-	PurpleCipherClass *klass = NULL;
-
-	g_return_val_if_fail(PURPLE_IS_CIPHER(cipher), NULL);
-
-	klass = PURPLE_CIPHER_GET_CLASS(cipher);
-
-	if(klass && klass->get_hash)
-		return klass->get_hash(cipher);
-
-	return NULL;
-}
============================================================
--- libpurple/cipher.h	c5af633ae2092a04910887fe64aa2c4d2ced2318
+++ libpurple/cipher.h	923e44290b3d030de4f6e20c349d0c72a720696e
@@ -110,12 +110,6 @@ struct _PurpleCipherClass {
 	/** The set key with length function */
 	void (*set_key_with_len)(PurpleCipher *cipher, const guchar *key, size_t len);
 
-	/** The get hash function */
-	PurpleCipher *(*get_hash)(PurpleCipher *cipher);
-
-	/** The set hash function */
-	void (*set_hash)(PurpleCipher *cipher, PurpleCipher *hash);
-
 	void (*_purple_reserved1)(void);
 	void (*_purple_reserved2)(void);
 	void (*_purple_reserved3)(void);
@@ -276,24 +270,6 @@ void purple_cipher_set_key_with_len(Purp
  */
 void purple_cipher_set_key_with_len(PurpleCipher *cipher, const guchar *key, size_t len);
 
-/**
- * Sets the internal hash of a cipher
- *
- * @param cipher   The cipher whose hash to set
- * @param hash	   The internal hash the cipher should use
- *
- */
-void purple_cipher_set_hash(PurpleCipher *cipher, PurpleCipher *hash);
-
-/**
- * Gets the internal hash of a cipher
- *
- * @param cipher   The cipher whose hash to get
- *
- * @return The internal hash the cipher is using.
- */
-PurpleCipher *purple_cipher_get_hash(PurpleCipher *cipher);
-
 /*@}*/
 
 G_END_DECLS


More information about the Commits mailing list