gobjectification: 9406d141: Move all cipher-related files to libpurp...
sadrul at pidgin.im
sadrul at pidgin.im
Thu Jul 8 14:21:25 EDT 2010
----------------------------------------------------------------------
Revision: 9406d1412dbd8fb4db2598f87cfce408daf2ce17
Parent: 95ad24a12277752e04ca17a353da10775371402d
Author: sadrul at pidgin.im
Date: 07/08/10 14:15:56
Branch: im.pidgin.gobjectification
URL: http://d.pidgin.im/viewmtn/revision/info/9406d1412dbd8fb4db2598f87cfce408daf2ce17
Changelog:
Move all cipher-related files to libpurple/cipher/
Changes against parent 95ad24a12277752e04ca17a353da10775371402d
renamed libpurple/cipher.c
to libpurple/cipher/cipher.c
renamed libpurple/cipher.h
to libpurple/cipher/cipher.h
renamed libpurple/des3cipher.c
to libpurple/cipher/des3cipher.c
renamed libpurple/des3cipher.h
to libpurple/cipher/des3cipher.h
renamed libpurple/descipher.c
to libpurple/cipher/descipher.c
renamed libpurple/descipher.h
to libpurple/cipher/descipher.h
renamed libpurple/ghash.c
to libpurple/cipher/ghash.c
renamed libpurple/ghash.h
to libpurple/cipher/ghash.h
renamed libpurple/hash.c
to libpurple/cipher/hash.c
renamed libpurple/hash.h
to libpurple/cipher/hash.h
renamed libpurple/hmaccipher.c
to libpurple/cipher/hmaccipher.c
renamed libpurple/hmaccipher.h
to libpurple/cipher/hmaccipher.h
renamed libpurple/md4hash.c
to libpurple/cipher/md4hash.c
renamed libpurple/md4hash.h
to libpurple/cipher/md4hash.h
renamed libpurple/md5cipher.c
to libpurple/cipher/md5cipher.c
renamed libpurple/md5cipher.h
to libpurple/cipher/md5cipher.h
renamed libpurple/rc4cipher.c
to libpurple/cipher/rc4cipher.c
renamed libpurple/rc4cipher.h
to libpurple/cipher/rc4cipher.h
renamed libpurple/sha1cipher.c
to libpurple/cipher/sha1cipher.c
renamed libpurple/sha1cipher.h
to libpurple/cipher/sha1cipher.h
renamed libpurple/sha256cipher.c
to libpurple/cipher/sha256cipher.c
renamed libpurple/sha256cipher.h
to libpurple/cipher/sha256cipher.h
added libpurple/cipher
patched libpurple/Makefile.am
patched libpurple/cipher/cipher.c
patched libpurple/cipher/des3cipher.h
patched libpurple/cipher/descipher.h
patched libpurple/cipher/ghash.h
patched libpurple/cipher/hmaccipher.h
patched libpurple/cipher/md4hash.h
patched libpurple/cipher/md5cipher.h
patched libpurple/cipher/rc4cipher.h
patched libpurple/cipher/sha1cipher.h
patched libpurple/cipher/sha256cipher.h
patched libpurple/ntlm.c
patched libpurple/plugins/ciphertest.c
patched libpurple/plugins/perl/common/module.h
patched libpurple/protocols/bonjour/bonjour_ft.c
patched libpurple/protocols/jabber/auth.c
patched libpurple/protocols/jabber/auth_digest_md5.c
patched libpurple/protocols/jabber/auth_scram.c
patched libpurple/protocols/jabber/bosh.c
patched libpurple/protocols/jabber/caps.c
patched libpurple/protocols/jabber/caps.h
patched libpurple/protocols/jabber/jutil.c
patched libpurple/protocols/msn/directconn.c
patched libpurple/protocols/msn/msn.h
patched libpurple/protocols/msn/msnutils.c
patched libpurple/protocols/msn/nexus.c
patched libpurple/protocols/msn/notification.c
patched libpurple/protocols/msn/object.c
patched libpurple/protocols/msn/user.c
patched libpurple/protocols/myspace/myspace.h
patched libpurple/protocols/oscar/clientlogin.c
patched libpurple/protocols/oscar/family_auth.c
patched libpurple/protocols/oscar/family_oservice.c
patched libpurple/protocols/oscar/oscar.c
patched libpurple/protocols/qq/qq_base.c
patched libpurple/protocols/qq/qq_network.c
patched libpurple/protocols/qq/qq_process.c
patched libpurple/protocols/qq/utils.c
patched libpurple/protocols/simple/simple.h
patched libpurple/protocols/yahoo/libymsg.c
patched libpurple/protocols/yahoo/yahoo_doodle.c
patched libpurple/proxy.c
patched libpurple/util.c
-------------- next part --------------
============================================================
--- libpurple/proxy.c 1dfca8b1ae5d258b8b5b8e23ce0662a803896ad8
+++ libpurple/proxy.c c4a1eb2cbc8e7409593b7e9af93fcd3a420e8f7b
@@ -33,7 +33,7 @@
#include "internal.h"
#include "debug.h"
#include "dnsquery.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "notify.h"
#include "ntlm.h"
#include "prefs.h"
============================================================
--- libpurple/util.c 589638e03c3519a9653f9e82fac0e79610a9f37a
+++ libpurple/util.c f534c3d20fe3e651ef482da1b7b0528814975c04
@@ -26,11 +26,11 @@
#include "conversation.h"
#include "core.h"
#include "debug.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
+#include "cipher/sha1cipher.h"
#include "notify.h"
#include "prpl.h"
#include "prefs.h"
-#include "sha1cipher.h"
#include "util.h"
struct _PurpleUtilFetchUrlData
============================================================
--- libpurple/protocols/jabber/jutil.c 57a92bf51d698dc9ad9cb52e23ea9b8efb189e10
+++ libpurple/protocols/jabber/jutil.c cb14ccf4db05e5f2d236d9d2ae9180a46de31f8c
@@ -25,9 +25,9 @@
#include "conversation.h"
#include "debug.h"
#include "server.h"
-#include "md4hash.h"
-#include "md5cipher.h"
-#include "sha1cipher.h"
+#include "cipher/md4hash.h"
+#include "cipher/md5cipher.h"
+#include "cipher/sha1cipher.h"
#include "util.h"
#include "xmlnode.h"
============================================================
--- libpurple/protocols/oscar/oscar.c f2e8f4f51f5cf0a5ee02206d6387fabf3a0590fb
+++ libpurple/protocols/oscar/oscar.c f9aff504cb3501887613cb0d27ea1513e5a0ac22
@@ -37,7 +37,7 @@
#include "core.h"
#include "debug.h"
#include "imgstore.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "network.h"
#include "notify.h"
#include "privacy.h"
============================================================
--- libpurple/protocols/yahoo/libymsg.c 095325b31cd189c70c17cb8501917aaa1186c9b0
+++ libpurple/protocols/yahoo/libymsg.c 9c5306bec85edb28689f95932fd90dc98b3fe9b2
@@ -30,14 +30,14 @@
#include "core.h"
#include "debug.h"
#include "network.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "notify.h"
#include "privacy.h"
#include "prpl.h"
#include "proxy.h"
#include "request.h"
#include "server.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
#include "util.h"
#include "version.h"
#include "xmlnode.h"
============================================================
--- libpurple/protocols/msn/msn.h 9201a5819f3da3593a50d6c450425e434032ca65
+++ libpurple/protocols/msn/msn.h 21b7bbd838e3e6e23aebf470bbb17c9eacb394e9
@@ -89,14 +89,14 @@ typedef enum
#include "connection.h"
#include "conversation.h"
#include "debug.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "notify.h"
#include "privacy.h"
#include "proxy.h"
#include "prpl.h"
#include "request.h"
#include "servconn.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
#include "sslconn.h"
#include "util.h"
============================================================
--- libpurple/protocols/msn/notification.c 8dba78c19c0e58f1efc47a89b3ea55289b681832
+++ libpurple/protocols/msn/notification.c 899d0ff83dacd78d89c3b63813c32f32045db9da
@@ -33,7 +33,7 @@
#include "sync.h"
#include "slplink.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
static MsnTable *cbs_table;
============================================================
--- libpurple/protocols/msn/user.c a4e765fb592077fd0cf45f538c3a794bc095946b
+++ libpurple/protocols/msn/user.c 5874d0e7d20611151c691a00c02b70fac179e88d
@@ -25,7 +25,7 @@
#include "user.h"
#include "slp.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
/*new a user object*/
MsnUser *
============================================================
--- libpurple/protocols/msn/msnutils.c c008f42b15f372043be5d3e318870c8291ab9793
+++ libpurple/protocols/msn/msnutils.c 8accc7885ad970c9b867ad6db05ea464e3c98fbf
@@ -24,7 +24,7 @@
#include "msn.h"
#include "msnutils.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
char *rand_guid(void);
============================================================
--- libpurple/plugins/perl/common/module.h 73da272237fbaf868e46746392aba8a39a0a3bb2
+++ libpurple/plugins/perl/common/module.h 833154df8e6e5425374240621cc1031c0982aeec
@@ -29,8 +29,8 @@ typedef struct group *Purple__Group;
#include "conversation.h"
#include "core.h"
#include "debug.h"
-#include "des3cipher.h"
-#include "descipher.h"
+#include "cipher/des3cipher.h"
+#include "cipher/descipher.h"
#include "desktopitem.h"
#include "eventloop.h"
#include "ft.h"
@@ -42,11 +42,11 @@ typedef struct group *Purple__Group;
#include "gtkutils.h"
#endif
#include "idle.h"
-#include "hash.h"
-#include "hmaccipher.h"
+#include "cipher/hash.h"
+#include "cipher/hmaccipher.h"
#include "imgstore.h"
-#include "md4hash.h"
-#include "md5cipher.h"
+#include "cipher/md4hash.h"
+#include "cipher/md5cipher.h"
#include "network.h"
#include "notify.h"
#include "plugin.h"
@@ -56,12 +56,12 @@ typedef struct group *Purple__Group;
#include "privacy.h"
#include "prpl.h"
#include "proxy.h"
-#include "rc4cipher.h"
+#include "cipher/rc4cipher.h"
#include "request.h"
#include "roomlist.h"
#include "savedstatuses.h"
#include "server.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
#include "signals.h"
#include "smiley.h"
#include "sound.h"
============================================================
--- libpurple/protocols/jabber/auth.c 0044d2d9578cd56a7190af67765066559b020336
+++ libpurple/protocols/jabber/auth.c e8c2264437f99db88273d134fc74e84aebdeabbd
@@ -26,8 +26,8 @@
#include "debug.h"
#include "core.h"
#include "conversation.h"
-#include "hmaccipher.h"
-#include "md5cipher.h"
+#include "cipher/hmaccipher.h"
+#include "cipher/md5cipher.h"
#include "request.h"
#include "sslconn.h"
#include "util.h"
============================================================
--- libpurple/protocols/msn/nexus.c d7f266daf12943347307a2f4fbeb713a995d95b6
+++ libpurple/protocols/msn/nexus.c 6b84597034f305313180420bbb9c1f634988858f
@@ -26,10 +26,10 @@
#include "nexus.h"
#include "notification.h"
-#include "des3cipher.h"
-#include "hmaccipher.h"
-#include "md5cipher.h"
-#include "sha1cipher.h"
+#include "cipher/des3cipher.h"
+#include "cipher/hmaccipher.h"
+#include "cipher/md5cipher.h"
+#include "cipher/sha1cipher.h"
/**************************************************************************
* Valid Ticket Tokens
============================================================
--- libpurple/protocols/msn/directconn.c dd9e393bbc4a3a0a01e557387422392233571ae6
+++ libpurple/protocols/msn/directconn.c 108def282e9b4b9eeb01eb30fe1fa5163ddf0974
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "msn.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
#include "directconn.h"
#include "slp.h"
============================================================
--- libpurple/protocols/msn/object.c 316060d6f7ed9b3fa2207922f9bc1b2692915b3a
+++ libpurple/protocols/msn/object.c bf487cc803f1a242fe07a21696b1c621665cfd1f
@@ -26,7 +26,7 @@
#include "object.h"
#include "debug.h"
/* Sha1 stuff */
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
/* Base64 stuff */
#include "util.h"
============================================================
--- libpurple/plugins/ciphertest.c 356a8b275398e7e9907d59105b681d70805da67a
+++ libpurple/plugins/ciphertest.c f62d5f00de77d42b125aac543d87bdea41b2764c
@@ -32,11 +32,11 @@
#include <glib.h>
#include <string.h>
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "debug.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "plugin.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
#include "util.h"
#include "version.h"
============================================================
--- libpurple/cipher.c 2707d9bafdb42c9d2ca66b57c59f3c07d0945e8d
+++ libpurple/cipher/cipher.c b020d34e894840cd049bb23661ab16c09f737596
@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
#include "internal.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
/*******************************************************************************
* Structs
============================================================
--- libpurple/protocols/simple/simple.h 24f6f70ea74764bc22b2788d37ba1c9eecfa4cc3
+++ libpurple/protocols/simple/simple.h 34020a4532ec9464d6c82babc885e557f13bfd88
@@ -26,7 +26,7 @@
#include <glib.h>
#include <time.h>
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "circbuffer.h"
#include "dnsquery.h"
#include "dnssrv.h"
============================================================
--- libpurple/ntlm.c 015ac20019b1ae663d290228de8b036709de06f7
+++ libpurple/ntlm.c 1385da8d4f292feba05e9f3342cc679938c97143
@@ -29,8 +29,8 @@
#include "util.h"
#include "ntlm.h"
#include "debug.h"
-#include "descipher.h"
-#include "md4hash.h"
+#include "cipher/descipher.h"
+#include "cipher/md4hash.h"
#include <string.h>
#define NTLM_NEGOTIATE_NTLM2_KEY 0x00080000
============================================================
--- libpurple/protocols/yahoo/yahoo_doodle.c eeb7ea2100a08e88fa00c60987e8909872e529fe
+++ libpurple/protocols/yahoo/yahoo_doodle.c f0e3f6c337b551bafaa908a0618e7d289943c0e4
@@ -29,7 +29,7 @@
#include "account.h"
#include "accountopt.h"
#include "blist.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "cmds.h"
#include "debug.h"
#include "notify.h"
============================================================
--- libpurple/protocols/oscar/family_auth.c f023d3ed77ed6360e450c9cbe865316a8125b272
+++ libpurple/protocols/oscar/family_auth.c 7bd324dee54af9f0bc3a2fb675a0c36ab89930f7
@@ -30,7 +30,7 @@
#include <ctype.h>
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
/* #define USE_XOR_FOR_ICQ */
============================================================
--- libpurple/protocols/oscar/family_oservice.c f8794c09b0c818b5b1f549b8d4a4ad683ac2ae8b
+++ libpurple/protocols/oscar/family_oservice.c 127346519e71a9ae95014c876c757cbcb7a760cd
@@ -25,7 +25,7 @@
#include "oscar.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
/*
* Each time we make a FLAP connection to an oscar server the server gives
============================================================
--- libpurple/protocols/qq/utils.c 5d5368690da14e01aa05ce92c5b2da0d3ce19644
+++ libpurple/protocols/qq/utils.c 38a6f1f66f8f500303a73bfa4490e95c6661be8f
@@ -32,7 +32,7 @@
#include "win32dep.h"
#endif
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "char_conv.h"
#include "debug.h"
============================================================
--- libpurple/Makefile.am c27e10aa80edb816e3109c5084420d412171b987
+++ libpurple/Makefile.am 5bef2b67ab77229c4b2b1c7f506abbf02521cf5f
@@ -44,29 +44,32 @@ purple_coresources = \
buddyicon.c \
certificate.c \
chat.c \
- cipher.c \
circbuffer.c \
+ cipher/cipher.c \
+ cipher/descipher.c \
+ cipher/des3cipher.c \
+ cipher/ghash.c \
+ cipher/hash.c \
+ cipher/hmaccipher.c \
+ cipher/md4hash.c \
+ cipher/md5cipher.c \
+ cipher/rc4cipher.c \
+ cipher/sha1cipher.c \
+ cipher/sha256cipher.c \
cmds.c \
connection.c \
conversation.c \
contact.c \
core.c \
debug.c \
- descipher.c \
- des3cipher.c \
desktopitem.c \
eventloop.c \
ft.c \
- ghash.c \
group.c \
gsignal.c \
- hash.c \
- hmaccipher.c \
idle.c \
imgstore.c \
log.c \
- md4hash.c \
- md5cipher.c \
media/backend-fs2.c \
media/backend-iface.c \
media/candidate.c \
@@ -87,13 +90,10 @@ purple_coresources = \
privacy.c \
proxy.c \
prpl.c \
- rc4cipher.c \
request.c \
roomlist.c \
savedstatuses.c \
server.c \
- sha1cipher.c \
- sha256cipher.c \
signals.c \
smiley.c \
dnsquery.c \
@@ -128,7 +128,17 @@ purple_coreheaders = \
buddyicon.h \
certificate.h \
chat.h \
- cipher.h \
+ cipher/cipher.h \
+ cipher/descipher.h \
+ cipher/des3cipher.h \
+ cipher/ghash.h \
+ cipher/hash.h \
+ cipher/hmaccipher.h \
+ cipher/md4hash.h \
+ cipher/md5cipher.h \
+ cipher/rc4cipher.h \
+ cipher/sha1cipher.h \
+ cipher/sha256cipher.h \
circbuffer.h \
cmds.h \
connection.h \
@@ -137,22 +147,15 @@ purple_coreheaders = \
core.h \
dbus-maybe.h \
debug.h \
- descipher.h \
- des3cipher.h \
desktopitem.h \
eventloop.h \
ft.h \
gaim-compat.h \
- ghash.h \
group.h \
gsignal.h \
- hash.h \
- hmaccipher.h \
idle.h \
imgstore.h \
log.h \
- md4hash.h \
- md5cipher.h \
media.h \
media-gst.h \
mediamanager.h \
@@ -169,7 +172,6 @@ purple_coreheaders = \
privacy.h \
proxy.h \
prpl.h \
- rc4cipher.h \
request.h \
roomlist.h \
savedstatuses.h \
@@ -178,8 +180,6 @@ purple_coreheaders = \
smiley.h \
dnsquery.h \
dnssrv.h \
- sha1cipher.h \
- sha256cipher.h \
status.h \
stringref.h \
stun.h \
============================================================
--- libpurple/protocols/myspace/myspace.h eec67f8e47840663c053c06e998828794b72df30
+++ libpurple/protocols/myspace/myspace.h 1af89d9965a67f7f7de3acbf74266f33a3589795
@@ -42,8 +42,8 @@
#include "plugin.h"
#include "accountopt.h"
#include "version.h"
-#include "sha1cipher.h"
-#include "rc4cipher.h"
+#include "cipher/sha1cipher.h"
+#include "cipher/rc4cipher.h"
#include "util.h" /* for base64 */
#include "debug.h" /* for purple_debug_info */
#include "request.h" /* For dialogs used in setting the username */
============================================================
--- libpurple/descipher.h e96a347c40f89b7ff6a006fc45a59ca19027a116
+++ libpurple/cipher/descipher.h 971835032f6bd178caffecbd89f9e3da59e642df
@@ -25,7 +25,7 @@
#ifndef PURPLE_DES_CIPHER_H
#define PURPLE_DES_CIPHER_H
-#include <cipher.h>
+#include <cipher/cipher.h>
#define PURPLE_TYPE_DES_CIPHER (purple_des_cipher_get_gtype())
#define PURPLE_DES_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_DES_CIPHER, PurpleDESCipher))
============================================================
--- libpurple/md4hash.h 21543c0a2e54804ba4a8f5c55c79f034e4255298
+++ libpurple/cipher/md4hash.h 4a8219499b254ecb507a1e1740edf3f5f2ba376a
@@ -25,7 +25,7 @@
#ifndef PURPLE_MD4_HASH_H
#define PURPLE_MD4_HASH_H
-#include <hash.h>
+#include <cipher/hash.h>
#define PURPLE_TYPE_MD4_HASH (purple_md4_hash_get_gtype())
#define PURPLE_MD4_HASH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MD4_HASH, PurpleMD4Hash))
============================================================
--- libpurple/md5cipher.h c52257e41c0689ab6639a9cd6d668bc1a4d2d487
+++ libpurple/cipher/md5cipher.h 69d3380069f6b9ec0368978235a24b8ecdfba624
@@ -25,8 +25,8 @@
#ifndef PURPLE_MD5_CIPHER_H
#define PURPLE_MD5_CIPHER_H
-#include <cipher.h>
-#include <ghash.h>
+#include <cipher/cipher.h>
+#include <cipher/ghash.h>
#define PURPLE_TYPE_MD5_CIPHER (purple_md5_cipher_get_gtype())
#define PURPLE_MD5_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_MD5_CIPHER, PurpleMD5Cipher))
============================================================
--- libpurple/sha1cipher.h 74a761b00fedb2e88b1111a2e868b54c4b57cfef
+++ libpurple/cipher/sha1cipher.h f8924a7896d521b47c60c2fee0b14f3aa80b0868
@@ -25,8 +25,8 @@
#ifndef PURPLE_SHA1_CIPHER_H
#define PURPLE_SHA1_CIPHER_H
-#include <cipher.h>
-#include <ghash.h>
+#include <cipher/cipher.h>
+#include <cipher/ghash.h>
#define PURPLE_TYPE_SHA1_CIPHER (purple_sha1_cipher_get_gtype())
#define PURPLE_SHA1_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_SHA1_CIPHER, PurpleSHA1Cipher))
============================================================
--- libpurple/protocols/jabber/caps.c c632c231b85c0afbe75ca86a1997c40566b5a0d8
+++ libpurple/protocols/jabber/caps.c 911bd02e2d590814c7a78191e1835eb62a609f4b
@@ -22,9 +22,9 @@
*/
#include "internal.h"
-#include "cipher.h"
-#include "md5cipher.h"
-#include "sha1cipher.h"
+#include "cipher/cipher.h"
+#include "cipher/md5cipher.h"
+#include "cipher/sha1cipher.h"
#include "debug.h"
#include "caps.h"
============================================================
--- libpurple/protocols/jabber/caps.h cc281f5689a5f57e479ef9df8bb873f150ebf6eb
+++ libpurple/protocols/jabber/caps.h 466f004386b7cdc33440a0a02d1c198c6ca02b30
@@ -27,7 +27,7 @@ typedef struct _JabberCapsClientInfo Jab
typedef struct _JabberCapsClientInfo JabberCapsClientInfo;
#include "jabber.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
/* Implementation of XEP-0115 - Entity Capabilities */
============================================================
--- libpurple/protocols/bonjour/bonjour_ft.c d834bd1132174f00922f589a333ae4ff55761349
+++ libpurple/protocols/bonjour/bonjour_ft.c baa91c87047927f84683be705d3d0a2cafc2c165
@@ -28,7 +28,7 @@
#include "buddy.h"
#include "bonjour.h"
#include "bonjour_ft.h"
-#include "sha1cipher.h"
+#include "cipher/sha1cipher.h"
static void
bonjour_bytestreams_init(PurpleXfer *xfer);
============================================================
--- libpurple/des3cipher.h 1cf98e02bab972f08aceb15845f8509861befe74
+++ libpurple/cipher/des3cipher.h a9dd402c95fa3f97378657bf13948c84892a1d0b
@@ -26,7 +26,7 @@
#ifndef PURPLE_DES3_CIPHER_H
#define PURPLE_DES3_CIPHER_H
-#include <cipher.h>
+#include <cipher/cipher.h>
#define PURPLE_TYPE_DES3_CIPHER (purple_des3_cipher_get_gtype())
#define PURPLE_DES3_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_DES3_CIPHER, PurpleDES3Cipher))
============================================================
--- libpurple/hmaccipher.h 4047baa4a510d9d08efc4423ba6e365696e6ad2b
+++ libpurple/cipher/hmaccipher.h 9aac4f253289575137da08e31aa2b01fc7ad9db6
@@ -26,7 +26,7 @@
#ifndef PURPLE_HMAC_CIPHER_H
#define PURPLE_HMAC_CIPHER_H
-#include <cipher.h>
+#include <cipher/cipher.h>
#define PURPLE_TYPE_HMAC_CIPHER (purple_hmac_cipher_get_gtype())
#define PURPLE_HMAC_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_HMAC_CIPHER, PurpleHMACCipher))
============================================================
--- libpurple/rc4cipher.h 98a9b8b7fd4ab55e84015c408c5014611f6c7be4
+++ libpurple/cipher/rc4cipher.h 3ad9c8fd7bc8fd22afe8070180eec70fdac29419
@@ -26,7 +26,7 @@
#ifndef PURPLE_RC4_CIPHER_H
#define PURPLE_RC4_CIPHER_H
-#include <cipher.h>
+#include <cipher/cipher.h>
#define PURPLE_TYPE_RC4_CIPHER (purple_rc4_cipher_get_gtype())
#define PURPLE_RC4_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_RC4_CIPHER, PurpleRC4Cipher))
============================================================
--- libpurple/protocols/qq/qq_network.c 70c4eab3ba327a3be44933202520acaf316e00a9
+++ libpurple/protocols/qq/qq_network.c 6ae92aa691f3786e35abe3aee02b6ccc7fffeee0
@@ -23,7 +23,7 @@
*/
#include "internal.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "debug.h"
#include "buddy_info.h"
============================================================
--- libpurple/protocols/qq/qq_base.c 1715fdb3b264fadf2328ff20ce83bef6d70ade07
+++ libpurple/protocols/qq/qq_base.c aecd6f5f4695d2d4fe4c229f605b6be466664d57
@@ -25,7 +25,7 @@
#include "internal.h"
#include "debug.h"
#include "server.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "request.h"
#include "buddy_info.h"
============================================================
--- libpurple/protocols/qq/qq_process.c f87d74a3961cfa51899ad9cc31afc09f51acd91b
+++ libpurple/protocols/qq/qq_process.c 12a9e0bd915c5e292e97a721496d76c21ca5afef
@@ -23,7 +23,7 @@
*/
#include "internal.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "debug.h"
#include "buddy_info.h"
============================================================
--- libpurple/protocols/jabber/bosh.c d9e943224049cf19d50cf0b9eec4d8c6d8011133
+++ libpurple/protocols/jabber/bosh.c 781fe1f0ce6bbbe406bac8dad3dbd8ff5979fdf1
@@ -23,7 +23,7 @@
#include "internal.h"
#include "circbuffer.h"
#include "core.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "debug.h"
#include "prpl.h"
#include "util.h"
============================================================
--- libpurple/protocols/oscar/clientlogin.c 49fae9558c5c0f763c490c200989488d78f592c0
+++ libpurple/protocols/oscar/clientlogin.c 7469c58781a27875d5a4261ec6ea104136b1fa01
@@ -39,12 +39,12 @@
#include "oscar.h"
#include "oscarcommon.h"
-#include "cipher.h"
+#include "cipher/cipher.h"
#include "core.h"
-#include "hmaccipher.h"
-#include "sha256cipher.h"
-#include "hmaccipher.h"
-#include "sha256cipher.h"
+#include "cipher/hmaccipher.h"
+#include "cipher/sha256cipher.h"
+#include "cipher/hmaccipher.h"
+#include "cipher/sha256cipher.h"
#define URL_CLIENT_LOGIN "https://api.screenname.aol.com/auth/clientLogin"
#define URL_START_OSCAR_SESSION "https://api.oscar.aol.com/aim/startOSCARSession"
============================================================
--- libpurple/ghash.h 7a263a93df0223f3e0f31842a68e30eca088ad11
+++ libpurple/cipher/ghash.h 136e94a7aa4d3bf337164553202aef693f1364b1
@@ -26,7 +26,7 @@
#ifndef PURPLE_GHASH_H
#define PURPLE_GHASH_H
-#include <cipher.h>
+#include <cipher/cipher.h>
#include <glib.h>
#if GLIB_CHECK_VERSION(2,16,0)
============================================================
--- libpurple/sha256cipher.h cac39b77faf7f2a231adffff2a1bb796e43a2b5a
+++ libpurple/cipher/sha256cipher.h 5a7e1ee62fd0252e04e656ed40f46b68a320e1d6
@@ -25,8 +25,8 @@
#ifndef PURPLE_SHA256_CIPHER_H
#define PURPLE_SHA256_CIPHER_H
-#include <cipher.h>
-#include <ghash.h>
+#include <cipher/cipher.h>
+#include <cipher/ghash.h>
#define PURPLE_TYPE_SHA256_CIPHER (purple_sha256_cipher_get_gtype())
#define PURPLE_SHA256_CIPHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), PURPLE_TYPE_SHA256_CIPHER, PurpleSHA256Cipher))
============================================================
--- libpurple/protocols/jabber/auth_digest_md5.c fe000e924a53bc4e70efeb286fef092877c9be4a
+++ libpurple/protocols/jabber/auth_digest_md5.c 76be7e49505301e8ff4f156d81f6baa9abac2a65
@@ -23,7 +23,7 @@
#include "internal.h"
#include "debug.h"
-#include "md5cipher.h"
+#include "cipher/md5cipher.h"
#include "util.h"
#include "xmlnode.h"
============================================================
--- libpurple/protocols/jabber/auth_scram.c 2ff7bdb9a0f8d05915b8aa4990ff3ebd89aa26bb
+++ libpurple/protocols/jabber/auth_scram.c e6368ac7c8321ce15067a16432d87528b87d34ea
@@ -25,9 +25,9 @@
#include "auth.h"
#include "auth_scram.h"
-#include "cipher.h"
-#include "hmaccipher.h"
-#include "sha1cipher.h"
+#include "cipher/cipher.h"
+#include "cipher/hmaccipher.h"
+#include "cipher/sha1cipher.h"
#include "debug.h"
static const JabberScramHash hashes[] = {
More information about the Commits
mailing list