summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-02-24 22:46:01 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-02-24 22:46:01 +0000
commit32999001b66935086fc9edaed08ce0113cb0492d (patch)
tree2011018c9f1b9b5c13709b10530c187588452681 /gnome-extra/evolution-data-server/files
parentClean up old revisions. (diff)
downloadgentoo-2-32999001b66935086fc9edaed08ce0113cb0492d.tar.gz
gentoo-2-32999001b66935086fc9edaed08ce0113cb0492d.tar.bz2
gentoo-2-32999001b66935086fc9edaed08ce0113cb0492d.zip
Clean up old revisions.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/evolution-data-server/files')
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch13
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch54
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch105
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch34
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch33
-rw-r--r--gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch144
6 files changed, 0 insertions, 383 deletions
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch
deleted file mode 100644
index b2b7769289e8..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/configure.in evolution-data-server-1.11.3/configure.in
---- evolution-data-server-1.11.3.orig/configure.in 2007-06-04 06:50:47.000000000 -0400
-+++ evolution-data-server-1.11.3/configure.in 2007-06-07 10:58:22.000000000 -0400
-@@ -1431,9 +1431,6 @@ export privdatadir
- if test $enable_calendar = yes; then
- AC_CONFIG_SUBDIRS(calendar/libical)
- fi
--if test $dynamic_libdb = no; then
-- AC_CONFIG_SUBDIRS(libdb/dist)
--fi
- AC_OUTPUT([
- Makefile
- evolution-data-server-zip
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch
deleted file mode 100644
index 57d10c82b2e4..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am evolution-data-server-2.23.6/addressbook/backends/Makefile.am
---- evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am 2008-08-04 00:28:27.000000000 -0400
-+++ evolution-data-server-2.23.6/addressbook/backends/Makefile.am 2008-08-05 12:26:15.000000000 -0400
-@@ -4,4 +4,4 @@ else
- LDAP_SUBDIR =
- endif
-
--SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav
-+SUBDIRS = file vcf $(LDAP_SUBDIR)
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am evolution-data-server-2.23.6/calendar/backends/Makefile.am
---- evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am 2008-04-11 07:10:31.000000000 -0400
-+++ evolution-data-server-2.23.6/calendar/backends/Makefile.am 2008-08-05 12:25:51.000000000 -0400
-@@ -1 +1 @@
--SUBDIRS = file groupwise http contacts weather caldav google
-+SUBDIRS = file http contacts weather caldav
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/camel/providers/Makefile.am evolution-data-server-2.23.6/camel/providers/Makefile.am
---- evolution-data-server-2.23.6.orig/camel/providers/Makefile.am 2008-08-01 02:34:59.000000000 -0400
-+++ evolution-data-server-2.23.6/camel/providers/Makefile.am 2008-08-05 12:26:59.000000000 -0400
-@@ -21,6 +21,6 @@ else
- SENDMAIL_DIR=sendmail
- endif
-
--SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR)
-+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) $(HULA_DIR)
-
-
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/Makefile.am evolution-data-server-2.23.6/Makefile.am
---- evolution-data-server-2.23.6.orig/Makefile.am 2008-08-01 02:35:37.000000000 -0400
-+++ evolution-data-server-2.23.6/Makefile.am 2008-08-05 12:28:22.000000000 -0400
-@@ -7,9 +7,12 @@ endif
-
- if ENABLE_CALENDAR
- CALENDAR_DIR = calendar
-+CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google
- endif
-
--SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po
-+LATER = camel/providers/groupwise addressbook/backends/groupwise addressbook/backends/google addressbook/backends/webdav $(CALENDAR_LATER)
-+
-+SUBDIRS = $(LIBDB) win32 libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po
- DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po
- changelogs = \
- ChangeLog
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am
---- evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am 2008-04-11 07:10:16.000000000 -0400
-+++ evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am 2008-08-05 12:25:51.000000000 -0400
-@@ -64,6 +64,7 @@ libexchange_storage_1_2_la_LIBADD = \
- $(top_builddir)/servers/exchange/lib/libexchange.la \
- $(top_builddir)/servers/exchange/xntlm/libxntlm.la \
- $(top_builddir)/libedataserver/libedataserver-1.2.la \
-+ $(top_builddir)/libedataserverui/libedataserverui-1.2.la \
- $(E_DATA_SERVER_LIBS) \
- $(E_DATA_SERVER_UI_LIBS) \
- $(LDAP_LIBS) \
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch
deleted file mode 100644
index b527c8021ba1..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.24.5.orig/camel/camel-smime-context.c evolution-data-server-2.24.5/camel/camel-smime-context.c
---- evolution-data-server-2.24.5.orig/camel/camel-smime-context.c 2008-09-22 06:53:58.000000000 -0400
-+++ evolution-data-server-2.24.5/camel/camel-smime-context.c 2009-03-07 14:52:57.000000000 -0500
-@@ -40,6 +40,7 @@
- #include <smime.h>
- #include <pkcs11t.h>
- #include <pk11func.h>
-+#include <secoid.h>
-
- #include <errno.h>
-
-@@ -534,6 +535,7 @@ sm_verify_cmsg(CamelCipherContext *conte
- for (i = 0; i < count; i++) {
- NSSCMSContentInfo *cinfo = NSS_CMSMessage_ContentLevel(cmsg, i);
- SECOidTag typetag = NSS_CMSContentInfo_GetContentTypeTag(cinfo);
-+ int which_digest;
-
- switch (typetag) {
- case SEC_OID_PKCS7_SIGNED_DATA:
-@@ -543,44 +545,49 @@ sm_verify_cmsg(CamelCipherContext *conte
- goto fail;
- }
-
-- /* need to build digests of the content */
-- if (!NSS_CMSSignedData_HasDigests(sigd)) {
-- if (extstream == NULL) {
-- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
-- goto fail;
-- }
--
-- if ((poolp = PORT_NewArena(1024)) == NULL) {
-- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
-- goto fail;
-- }
--
-- digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd);
--
-- digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
-- if (digcx == NULL) {
-- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-- goto fail;
-- }
--
-- mem = (CamelStreamMem *)camel_stream_mem_new();
-- camel_stream_write_to_stream(extstream, (CamelStream *)mem);
-- NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len);
-- camel_object_unref(mem);
--
-- if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
-- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-- goto fail;
-- }
--
-- if (NSS_CMSSignedData_SetDigests(sigd, digestalgs, digests) != SECSuccess) {
-- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-- goto fail;
-- }
-
-- PORT_FreeArena(poolp, PR_FALSE);
-- poolp = NULL;
-+ if (extstream == NULL) {
-+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data"));
-+ goto fail;
-+ }
-+
-+ if ((poolp = PORT_NewArena(1024)) == NULL) {
-+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM));
-+ goto fail;
- }
-+
-+ digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd);
-+
-+ digcx = NSS_CMSDigestContext_StartMultiple(digestalgs);
-+ if (digcx == NULL) {
-+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-+ goto fail;
-+ }
-+
-+ mem = (CamelStreamMem *)camel_stream_mem_new();
-+ camel_stream_write_to_stream(extstream, (CamelStream *)mem);
-+ NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len);
-+ camel_object_unref(mem);
-+
-+ if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) {
-+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests"));
-+ goto fail;
-+ }
-+
-+ for (which_digest = 0; digests[which_digest] != NULL; which_digest++) {
-+ SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm);
-+ if (digest_alg == NULL) {
-+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-+ goto fail;
-+ }
-+ if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) {
-+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests"));
-+ goto fail;
-+ }
-+ }
-+
-+ PORT_FreeArena(poolp, PR_FALSE);
-+ poolp = NULL;
-
- /* import all certificates present */
- if (NSS_CMSSignedData_ImportCerts(sigd, p->certdb, certUsageEmailSigner, PR_TRUE) != SECSuccess) {
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch
deleted file mode 100644
index 2671d0de0000..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From dcd2f9ebc6c66ab1c068764da3b528f8fbfeb8b5 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Tue, 31 Mar 2009 11:54:36 +0000
-Subject: [PATCH] ** Fix for bug #564465
-
-2009-03-31 Milan Crha <mcrha@redhat.com>
-
- ** Fix for bug #564465
-
- * camel-smime-context.c: (sm_decrypt):
- Pass correct body for signature verification.
-
-svn path=/trunk/; revision=10194
----
- camel/camel-smime-context.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c
-index 7470953..1913d6a 100644
---- a/camel/camel-smime-context.c
-+++ b/camel/camel-smime-context.c
-@@ -963,7 +963,8 @@ sm_decrypt(CamelCipherContext *context, CamelMimePart *ipart, CamelMimePart *opa
- camel_data_wrapper_construct_from_stream((CamelDataWrapper *)opart, ostream);
-
- if (NSS_CMSMessage_IsSigned(cmsg)) {
-- valid = sm_verify_cmsg(context, cmsg, NULL, ex);
-+ camel_stream_reset (ostream);
-+ valid = sm_verify_cmsg (context, cmsg, ostream, ex);
- } else {
- valid = camel_cipher_validity_new();
- valid->encrypt.description = g_strdup(_("Encrypted content"));
---
-1.6.3.3
-
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch
deleted file mode 100644
index 8db09e87acbc..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur evolution-data-server-2.26.2.orig/configure.in evolution-data-server-2.26.2/configure.in
---- evolution-data-server-2.26.2.orig/configure.in 2009-05-28 07:54:11.117306805 +0200
-+++ evolution-data-server-2.26.2/configure.in 2009-05-28 07:56:19.107288441 +0200
-@@ -1196,24 +1196,24 @@
-
- msg_krb5="no"
- if test "x${with_krb5}" != "xno"; then
-- LDFLAGS_save="$LDFLAGS"
-+ LIBS_save="$LIBS"
-
- mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
- sunlibs="-lkrb5 -lgss"
- AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5,
- [
-- LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs"
-+ LIBS="$LIBS -L$with_krb5_libs $mitlibs"
- AC_TRY_LINK([#include <krb5.h>],krb5_init_context, ac_cv_lib_kerberos5="$mitlibs",
- [
-- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs"
-+ LIBS="$LIBS_save -L$with_krb5_libs $heimlibs"
- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs",
- [
-- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs"
-+ LIBS="$LIBS_save -L$with_krb5_libs $sunlibs"
- AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no")
- ])
- ])
-- LDFLAGS="$LDFLAGS_save"
-+ LIBS="$LIBS_save"
- ])
- if test "$ac_cv_lib_kerberos5" != "no"; then
- AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5])
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch
deleted file mode 100644
index 46231c0c0c39..000000000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Index: camel/camel-sasl-ntlm.c
-===================================================================
---- camel/camel-sasl-ntlm.c (revision 10105)
-+++ camel/camel-sasl-ntlm.c (working copy)
-@@ -74,9 +74,8 @@ camel_sasl_ntlm_get_type (void)
-
- #define NTLM_REQUEST "NTLMSSP\x00\x01\x00\x00\x00\x06\x82\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00"
-
--#define NTLM_CHALLENGE_NONCE_OFFSET 24
--#define NTLM_CHALLENGE_DOMAIN_OFFSET 48
--#define NTLM_CHALLENGE_DOMAIN_LEN_OFFSET 44
-+#define NTLM_CHALLENGE_DOMAIN_OFFSET 12
-+#define NTLM_CHALLENGE_NONCE_OFFSET 24
-
- #define NTLM_RESPONSE_HEADER "NTLMSSP\x00\x03\x00\x00\x00"
- #define NTLM_RESPONSE_FLAGS "\x82\x01"
-@@ -93,22 +92,60 @@ static void ntlm_calc_response (const
- guchar results[24]);
- static void ntlm_lanmanager_hash (const char *password, char hash[21]);
- static void ntlm_nt_hash (const char *password, char hash[21]);
--static void ntlm_set_string (GByteArray *ba, int offset,
-- const char *data, int len);
-+
-+typedef struct {
-+ guint16 length;
-+ guint16 allocated;
-+ guint32 offset;
-+} SecurityBuffer;
-+
-+static GString *
-+ntlm_get_string (GByteArray *ba, int offset)
-+{
-+ SecurityBuffer *secbuf;
-+ GString *string;
-+ gchar *buf_string;
-+ guint16 buf_length;
-+ guint32 buf_offset;
-+
-+ secbuf = (SecurityBuffer *) &ba->data[offset];
-+ buf_length = GUINT16_FROM_LE (secbuf->length);
-+ buf_offset = GUINT32_FROM_LE (secbuf->offset);
-+
-+ if (ba->len < buf_offset + buf_length)
-+ return NULL;
-+
-+ string = g_string_sized_new (buf_length);
-+ buf_string = (gchar *) &ba->data[buf_offset];
-+ g_string_append_len (string, buf_string, buf_length);
-+
-+ return string;
-+}
-+
-+static void
-+ntlm_set_string (GByteArray *ba, int offset, const char *data, int len)
-+{
-+ SecurityBuffer *secbuf;
-+
-+ secbuf = (SecurityBuffer *) &ba->data[offset];
-+ secbuf->length = GUINT16_TO_LE (len);
-+ secbuf->offset = GUINT32_TO_LE (ba->len);
-+ secbuf->allocated = secbuf->length;
-+
-+ g_byte_array_append (ba, (guint8 *) data, len);
-+}
-
- static GByteArray *
- ntlm_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex)
- {
- GByteArray *ret;
- guchar nonce[8], hash[21], lm_resp[24], nt_resp[24];
-+ GString *domain;
-
- ret = g_byte_array_new ();
-
-- if (!token || !token->len) {
-- g_byte_array_append (ret, (guint8 *) NTLM_REQUEST,
-- sizeof (NTLM_REQUEST) - 1);
-- return ret;
-- }
-+ if (!token || token->len < NTLM_CHALLENGE_NONCE_OFFSET + 8)
-+ goto fail;
-
- memcpy (nonce, token->data + NTLM_CHALLENGE_NONCE_OFFSET, 8);
- ntlm_lanmanager_hash (sasl->service->url->passwd, (char *) hash);
-@@ -116,7 +153,11 @@ ntlm_challenge (CamelSasl *sasl, GByteAr
- ntlm_nt_hash (sasl->service->url->passwd, (char *) hash);
- ntlm_calc_response (hash, nonce, nt_resp);
-
-- ret = g_byte_array_new ();
-+ domain = ntlm_get_string (token, NTLM_CHALLENGE_DOMAIN_OFFSET);
-+ if (domain == NULL)
-+ goto fail;
-+
-+ /* Don't jump to 'fail' label after this point. */
- g_byte_array_set_size (ret, NTLM_RESPONSE_BASE_SIZE);
- memset (ret->data, 0, NTLM_RESPONSE_BASE_SIZE);
- memcpy (ret->data, NTLM_RESPONSE_HEADER,
-@@ -125,8 +166,7 @@ ntlm_challenge (CamelSasl *sasl, GByteAr
- NTLM_RESPONSE_FLAGS, sizeof (NTLM_RESPONSE_FLAGS) - 1);
-
- ntlm_set_string (ret, NTLM_RESPONSE_DOMAIN_OFFSET,
-- (const char *) token->data + NTLM_CHALLENGE_DOMAIN_OFFSET,
-- atoi ((char *) token->data + NTLM_CHALLENGE_DOMAIN_LEN_OFFSET));
-+ domain->str, domain->len);
- ntlm_set_string (ret, NTLM_RESPONSE_USER_OFFSET,
- sasl->service->url->user,
- strlen (sasl->service->url->user));
-@@ -138,6 +178,18 @@ ntlm_challenge (CamelSasl *sasl, GByteAr
- (const char *) nt_resp, sizeof (nt_resp));
-
- sasl->authenticated = TRUE;
-+
-+ g_string_free (domain, TRUE);
-+
-+ goto exit;
-+
-+fail:
-+ /* If the challenge is malformed, restart authentication.
-+ * XXX A malicious server could make this loop indefinitely. */
-+ g_byte_array_append (ret, (guint8 *) NTLM_REQUEST,
-+ sizeof (NTLM_REQUEST) - 1);
-+
-+exit:
- return ret;
- }
-
-@@ -201,17 +253,6 @@ ntlm_nt_hash (const char *password, char
- g_free (buf);
- }
-
--static void
--ntlm_set_string (GByteArray *ba, int offset, const char *data, int len)
--{
-- ba->data[offset ] = ba->data[offset + 2] = len & 0xFF;
-- ba->data[offset + 1] = ba->data[offset + 3] = (len >> 8) & 0xFF;
-- ba->data[offset + 4] = ba->len & 0xFF;
-- ba->data[offset + 5] = (ba->len >> 8) & 0xFF;
-- g_byte_array_append (ba, (guint8 *) data, len);
--}
--
--
- #define KEYBITS(k,s) \
- (((k[(s)/8] << ((s)%8)) & 0xFF) | (k[(s)/8+1] >> (8-(s)%8)))
-