fixing 2012: network structure alignment now forced to be correct even on W32 using #pragma pack from gcc 4.x

3 files changed, 8 insertions, 2 deletions

diff --git a/src/util/crypto_ksk.c b/src/util/crypto_ksk.c
index 60639a709..0f5a29507 100644
--- a/src/util/crypto_ksk.c
+++ b/src/util/crypto_ksk.c
@@ -463,6 +463,7 @@ generate_kblock_key (KBlock_secret_key *sk, unsigned int nbits,
   gcry_mpi_release (g);
 }
 
+GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
  * Internal representation of the private key.
@@ -482,7 +483,7 @@ struct KskRsaPrivateKeyBinaryEncoded
   uint16_t sizedmq1 GNUNET_PACKED;      /*  in big-endian! */
   /* followed by the actual values */
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 /**
  * Deterministically (!) create a hostkey using only the
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index d29566ac8..418fe833b 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -53,6 +53,8 @@ struct GNUNET_CRYPTO_RsaPrivateKey
 };
 
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * GNUnet mandates a certain format for the encoding
  * of private RSA key information that is provided
@@ -75,7 +77,7 @@ struct RsaPrivateKeyBinaryEncoded
   uint16_t sizedmq1 GNUNET_PACKED;      /*  in big-endian! */
   /* followed by the actual values */
 };
-
+GNUNET_NETWORK_STRUCT_END
 
 #define HOSTKEY_LEN 2048
 
diff --git a/src/util/resolver.h b/src/util/resolver.h
index 57cb68650..eca753a55 100644
--- a/src/util/resolver.h
+++ b/src/util/resolver.h
@@ -29,6 +29,8 @@
 
 #define DEBUG_RESOLVER GNUNET_EXTRA_LOGGING
 
+GNUNET_NETWORK_STRUCT_BEGIN
+
 /**
  * Request for the resolver.  Followed by either
  * the "struct sockaddr" or the 0-terminated hostname.
@@ -59,5 +61,6 @@ struct GNUNET_RESOLVER_GetMessage
   int32_t domain GNUNET_PACKED;
 
 };
+GNUNET_NETWORK_STRUCT_END
 
 #endif