From e1b9fcd4b185cdcfd460a5d2ecb29d085856bb20 Mon Sep 17 00:00:00 2001
From: malosek <malosek@fastmq.com>
Date: Mon, 5 Oct 2009 10:18:24 +0200
Subject: moved pgm_create_custom_gsi into PGM1 and drop ssl dependency

---
 src/pgm_socket.cpp  | 18 +-----------------
 src/pgm_socket.hpp  |  3 ---
 src/platform.hpp.in |  6 ------
 3 files changed, 1 insertion(+), 26 deletions(-)

(limited to 'src')

diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index e8a3b16..57eef6c 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -22,11 +22,10 @@
 #ifdef ZMQ_HAVE_OPENPGM
 
 #ifdef ZMQ_HAVE_LINUX
-//  TODO: add this into platform.hpp?
+//  TODO: needed for pgm - add this into platform.hpp?
 #define CONFIG_HAVE_POLL
 
 #include <pgm/pgm.h>
-#include <openssl/md5.h>
 #endif
 
 #include <string>
@@ -69,21 +68,6 @@ zmq::pgm_socket_t::pgm_socket_t (bool receiver_, const options_t &options_) :
     
 }
 
-int zmq::pgm_socket_t::pgm_create_custom_gsi (const char *data_, pgm_gsi_t *gsi_)
-{
-
-    unsigned char result_md5 [16];
-
-    MD5_CTX ctx;
-    MD5_Init (&ctx);
-    MD5_Update (&ctx, data_, strlen (data_));
-    MD5_Final (result_md5, &ctx);
-
-    memcpy (gsi_, result_md5 + 10, 6);
-
-    return 0;
-}
-
 int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
 {
     udp_encapsulation = udp_encapsulation_;
diff --git a/src/pgm_socket.hpp b/src/pgm_socket.hpp
index 473e58c..c9d03bd 100644
--- a/src/pgm_socket.hpp
+++ b/src/pgm_socket.hpp
@@ -96,9 +96,6 @@ namespace zmq
         //  Returns maximum count of apdus which fills readbuf_size_
         size_t get_max_apdu_at_once (size_t readbuf_size_);
 
-        //  Compute gsi from string.
-        int pgm_create_custom_gsi (const char *data_, pgm_gsi_t *gsi_);
-
         //  Associated socket options.
         options_t options;
        
diff --git a/src/platform.hpp.in b/src/platform.hpp.in
index 3c28737..6f352fb 100644
--- a/src/platform.hpp.in
+++ b/src/platform.hpp.in
@@ -36,9 +36,6 @@
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 
-/* Define to 1 if you have the `ssl' library (-lssl). */
-#undef HAVE_LIBSSL
-
 /* Define to 1 if you have the `stdc++' library (-lstdc++). */
 #undef HAVE_LIBSTDC__
 
@@ -64,9 +61,6 @@
 /* Define to 1 if you have the <netinet/tcp.h> header file. */
 #undef HAVE_NETINET_TCP_H
 
-/* Define to 1 if you have the <openssl/md5.h> header file. */
-#undef HAVE_OPENSSL_MD5_H
-
 /* Define to 1 if you have the `perror' function. */
 #undef HAVE_PERROR
 
-- 
cgit v1.2.3