[ViewVC] Diff of: cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.106 by root, Fri Jul 19 21:01:16 2013 UTC vs.
Revision 1.107 by root, Fri Sep 20 11:57:03 2013 UTC

 #include <list>
 #include <queue>
 #include <utility>
+#include <openssl/opensslv.h>
 #include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/err.h>
+// openssl 0.9.8 compatibility
+#if OPENSSL_VERSION_NUMBER < 0x10100000
+  #define require101(exp) exp
+#else
+  #define require101(exp) equire (exp)
+#endif
 #include "conf.h"
 #include "slog.h"
 #include "device.h"
 #include "vpn.h"
     kdf.extract (s, sizeof (s));
     kdf.extract_done (HKDF_PRF_HASH ());
     kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
     HMAC_CTX_init (&hctx);
-    require (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
+    require101 (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
   }
   {
     u8 cipher_key[CIPHER_KEYSIZE];
     static const unsigned char cipher_info[] = "gvpe cipher key";
 void
 hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
 {
   HMAC_CTX *hctx = &ctx->hctx;
-  require (HMAC_Init_ex (hctx, 0, 0, 0, 0));
+  require101 (HMAC_Init_ex (hctx, 0, 0, 0, 0));
-  require (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
+  require101 (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
-  require (HMAC_Final (hctx, hmac_digest, 0));
+  require101 (HMAC_Final (hctx, hmac_digest, 0));
 }
 void
 hmac_packet::hmac_set (crypto_ctx *ctx)
 {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines