Move unhex() out of DTLS ifdef, to build with OpenSSL 0.9.7 again

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/dtls.c b/dtls.c
index 3d09552..d8839ae 100644 (file)
--- a/dtls.c
+++ b/dtls.c
@@ -35,6 +35,19 @@
 
 #include "openconnect.h"
 
+static unsigned char nybble(unsigned char n)
+{
+       if      (n >= '0' && n <= '9') return n - '0';
+       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
+       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
+       return 0;
+}
+
+unsigned char unhex(const char *data)
+{
+       return (nybble(data[0]) << 4) | nybble(data[1]);
+}
+
 #ifdef SSL_F_DTLS1_CONNECT
 #if 0
 /*
@@ -90,19 +103,6 @@ int RAND_bytes(char *buf, int len)
  * their clients use anyway.
  */
 
-static unsigned char nybble(unsigned char n)
-{
-       if      (n >= '0' && n <= '9') return n - '0';
-       else if (n >= 'A' && n <= 'F') return n - ('A' - 10);
-       else if (n >= 'a' && n <= 'f') return n - ('a' - 10);
-       return 0;
-}
-
-unsigned char unhex(const char *data)
-{
-       return (nybble(data[0]) << 4) | nybble(data[1]);
-}
-
 int connect_dtls_socket(struct openconnect_info *vpninfo)
 {
        STACK_OF(SSL_CIPHER) *ciphers;