Add md5.[ch] for when we are configured without OpenSSL.

[radsecproxy.git] / lib / radius / client.h

diff --git a/lib/radius/client.h b/lib/radius/client.h
index df9f834..ab4718a 100644 (file)
--- a/lib/radius/client.h
+++ b/lib/radius/client.h
@@ -35,21 +35,32 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /*
  *  System-specific header files.
  */
+#include <config.h>
 #include <errno.h>
 #include <stdio.h>
+#ifdef HAVE_STDINT_H
 #include <stdint.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <stdarg.h>
+#include <sys/types.h>
+#ifdef HAVE_NETDB_H
 #include <netdb.h>
+#endif
+#ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
+#endif
 
 #include <radsec/radsec.h>
-
-/*
- *  Definitions of attributes.
- */
+#include <radsec/radsec-impl.h>
 #include <radsec/radius.h>
 
 /** \defgroup build Build Helpers
@@ -140,25 +151,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #ifdef WITHOUT_OPENSSL
-#ifndef RS_MD5_CTX
-#error RS_MD5_CTX must be defined
-#endif
-#ifndef RS_MD5Init
-#error n_rMD5Init must be defined
-#endif
-#ifndef RS_MD5Update
-#error RS_MD5Updyae must be defined
-#endif
-#ifndef RS_MD5Final
-#error RS_MD5Final must be defined
-#endif
-#ifndef RS_MD5Transform
-#error RS_MD5Transform must be defined
+#include "md5.h"
+#else
+#include <openssl/md5.h>
 #endif
 
-#else  /* WITHOUT_OPENSSL */
-
-#include <openssl/md5.h>
 /** Define for compile-time selection of the MD5 functions.  Defaults to using the OpenSSL functions.  \ingroup custom */
 #define RS_MD5_CTX     MD5_CTX
 /** Define for compile-time selection of the MD5 functions.  Defaults to using the OpenSSL functions. \ingroup custom */
@@ -167,9 +164,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define RS_MD5Update   MD5_Update
 /** Define for compile-time selection of the MD5 functions.  Defaults to using the OpenSSL functions. \ingroup custom */
 #define RS_MD5Final    MD5_Final
-/** Define for compile-time selection of the MD5 functions.  Defaults to using the OpenSSL functions. \ingroup custom */
-#define RS_MD5Transform MD5_Transform
-#endif
+
 
 #ifndef RS_MAX_PACKET_LEN
 /** The maximum size of a packet that the library will send or receive.  \ingroup custom
@@ -239,12 +234,9 @@ typedef struct attr_flags {
        unsigned int            has_tlv : 1; /* has sub attributes */
        unsigned int            is_tlv : 1; /* is a sub attribute */
 #endif
-#ifdef VENDOR_EXTENDED
        unsigned int            extended : 1; /* extended attribute */
        unsigned int            extended_flags : 1; /* with flag */
        unsigned int            evs : 1;            /* extended VSA */
-#endif
-
        uint8_t                 encrypt;      /**< Attribute encryption method */
        uint8_t                 length;       /**< The expected length of the attribute */
 } ATTR_FLAGS;