summaryrefslogtreecommitdiffstats
path: root/src/crypto.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/crypto.cpp')
-rw-r--r--src/crypto.cpp33
1 files changed, 19 insertions, 14 deletions
diff --git a/src/crypto.cpp b/src/crypto.cpp
index 3fb4696..0e6836f 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -37,10 +37,25 @@
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */
/* See Tor LICENSE for licensing information */
/* $Id: crypto.cpp,v 1.11 2008/07/31 19:56:26 hoganrobert Exp $ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <kdebug.h>
+
#include <string.h>
-#include <kdebug.h>
-#include "crypto.h"
-#include "../config.h"
+#include <stdlib.h>
+#include <assert.h>
+#include <stdio.h>
+#include <limits.h>
+#include <ctype.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <sys/fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <stdint.h>
#ifndef USE_OPENSSL
#include <gnutls/gnutls.h>
@@ -59,18 +74,8 @@
#include <openssl/conf.h>
#endif
-#include <stdlib.h>
-#include <assert.h>
-#include <stdio.h>
-#include <limits.h>
+#include "crypto.h"
-#include <ctype.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sys/fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <stdint.h>
/* random numbers */