Merge branch 'bug8153'

6 files changed, 58 insertions, 37 deletions

diff --git a/changes/bug8153 b/changes/bug8153
new file mode 100644
index 0000000000..9178f25bac
--- /dev/null
+++ b/changes/bug8153
@@ -0,0 +1,3 @@
+  o Minor bugfixes:
+    - Compile correctly with the --disable-curve25519 option. Fix for
+      bug 8153; bugfix on 0.2.4.8-alpha.
diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c
index 62398f62e6..425a1a078c 100644
--- a/src/common/crypto_curve25519.c
+++ b/src/common/crypto_curve25519.c
@@ -182,34 +182,3 @@ curve25519_handshake(uint8_t *output,
   curve25519_impl(output, skey->secret_key, pkey->public_key);
 }
 
-int
-curve25519_public_to_base64(char *output,
-                            const curve25519_public_key_t *pkey)
-{
-  char buf[128];
-  base64_encode(buf, sizeof(buf),
-                (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN);
-  buf[CURVE25519_BASE64_PADDED_LEN] = '\0';
-  memcpy(output, buf, CURVE25519_BASE64_PADDED_LEN+1);
-  return 0;
-}
-
-int
-curve25519_public_from_base64(curve25519_public_key_t *pkey,
-                              const char *input)
-{
-  size_t len = strlen(input);
-  if (len == CURVE25519_BASE64_PADDED_LEN - 1) {
-    /* not padded */
-    return digest256_from_base64((char*)pkey->public_key, input);
-  } else if (len == CURVE25519_BASE64_PADDED_LEN) {
-    char buf[128];
-    if (base64_decode(buf, sizeof(buf), input, len) != CURVE25519_PUBKEY_LEN)
-      return -1;
-    memcpy(pkey->public_key, buf, CURVE25519_PUBKEY_LEN);
-    return 0;
-  } else {
-    return -1;
-  }
-}
-
diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h
index 5524415492..652f1883c6 100644
--- a/src/common/crypto_curve25519.h
+++ b/src/common/crypto_curve25519.h
@@ -51,6 +51,12 @@ int curve25519_keypair_read_from_file(curve25519_keypair_t *keypair_out,
                                       char **tag_out,
                                       const char *fname);
 
+#ifdef CRYPTO_CURVE25519_PRIVATE
+int curve25519_impl(uint8_t *output, const uint8_t *secret,
+                    const uint8_t *basepoint);
+#endif
+#endif
+
 #define CURVE25519_BASE64_PADDED_LEN 44
 
 int curve25519_public_from_base64(curve25519_public_key_t *pkey,
@@ -58,11 +64,5 @@ int curve25519_public_from_base64(curve25519_public_key_t *pkey,
 int curve25519_public_to_base64(char *output,
                                 const curve25519_public_key_t *pkey);
 
-#ifdef CRYPTO_CURVE25519_PRIVATE
-int curve25519_impl(uint8_t *output, const uint8_t *secret,
-                    const uint8_t *basepoint);
-#endif
-#endif
-
 #endif
 
diff --git a/src/common/crypto_format.c b/src/common/crypto_format.c
new file mode 100644
index 0000000000..93932f839c
--- /dev/null
+++ b/src/common/crypto_format.c
@@ -0,0 +1,46 @@
+/* Copyright (c) 2012-2013, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+/* Formatting and parsing code for crypto-related data structures. */
+
+#define CRYPTO_CURVE25519_PRIVATE
+#include "orconfig.h"
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
+#include "crypto.h"
+#include "crypto_curve25519.h"
+#include "util.h"
+#include "torlog.h"
+
+int
+curve25519_public_to_base64(char *output,
+                            const curve25519_public_key_t *pkey)
+{
+  char buf[128];
+  base64_encode(buf, sizeof(buf),
+                (const char*)pkey->public_key, CURVE25519_PUBKEY_LEN);
+  buf[CURVE25519_BASE64_PADDED_LEN] = '\0';
+  memcpy(output, buf, CURVE25519_BASE64_PADDED_LEN+1);
+  return 0;
+}
+
+int
+curve25519_public_from_base64(curve25519_public_key_t *pkey,
+                              const char *input)
+{
+  size_t len = strlen(input);
+  if (len == CURVE25519_BASE64_PADDED_LEN - 1) {
+    /* not padded */
+    return digest256_from_base64((char*)pkey->public_key, input);
+  } else if (len == CURVE25519_BASE64_PADDED_LEN) {
+    char buf[128];
+    if (base64_decode(buf, sizeof(buf), input, len) != CURVE25519_PUBKEY_LEN)
+      return -1;
+    memcpy(pkey->public_key, buf, CURVE25519_PUBKEY_LEN);
+    return 0;
+  } else {
+    return -1;
+  }
+}
+
diff --git a/src/common/include.am b/src/common/include.am
index 808238dd1f..b796ebfae8 100644
--- a/src/common/include.am
+++ b/src/common/include.am
@@ -52,6 +52,7 @@ src_common_libor_a_SOURCES = \
 src_common_libor_crypto_a_SOURCES = \
   src/common/aes.c		\
   src/common/crypto.c		\
+  src/common/crypto_format.c	\
   src/common/torgzip.c		\
   src/common/tortls.c		\
   $(libcrypto_extra_source)
diff --git a/src/or/onion.c b/src/or/onion.c
index b9f5aa6c7d..d4a65022fc 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -82,6 +82,8 @@ have_room_for_onionskin(uint16_t type)
   if (type == ONION_HANDSHAKE_TYPE_TAP &&
       tap_usec / 1000 > (uint64_t)options->MaxOnionQueueDelay * 2 / 3)
     return 0;
+#else
+  (void) type;
 #endif
 
   return 1;