summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2015-02-16 18:26:26 +0000
committermiod <miod@openbsd.org>2015-02-16 18:26:26 +0000
commita7f6b79f9f5b4ad9fd8c25d7cb024ba791f7fcf2 (patch)
tree6c2b66d45fe56c480608cf5b40f069fd91b2f1f5
parentavoid double vlan-header or vlan-header for non-vlan(4) interfaces (diff)
downloadwireguard-openbsd-a7f6b79f9f5b4ad9fd8c25d7cb024ba791f7fcf2.tar.xz
wireguard-openbsd-a7f6b79f9f5b4ad9fd8c25d7cb024ba791f7fcf2.zip
Declare ge25519_base as extern, to prevent it from becoming a common. Gets us
rid of ``lignment 4 of symbol `crypto_sign_ed25519_ref_ge25519_base' in mod_ge25519.o is smaller than 16 in mod_ed25519.o'' warnings at link time.
-rw-r--r--usr.bin/signify/ge25519.h4
-rw-r--r--usr.bin/ssh/ge25519.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/signify/ge25519.h b/usr.bin/signify/ge25519.h
index 0f4660cf909..165844ec5b2 100644
--- a/usr.bin/signify/ge25519.h
+++ b/usr.bin/signify/ge25519.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ge25519.h,v 1.1 2014/07/22 00:41:19 deraadt Exp $ */
+/* $OpenBSD: ge25519.h,v 1.2 2015/02/16 18:26:26 miod Exp $ */
/*
* Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
@@ -28,7 +28,7 @@ typedef struct
fe25519 t;
} ge25519;
-const ge25519 ge25519_base;
+extern const ge25519 ge25519_base;
int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]);
diff --git a/usr.bin/ssh/ge25519.h b/usr.bin/ssh/ge25519.h
index 64f63c6f8f4..a0976376093 100644
--- a/usr.bin/ssh/ge25519.h
+++ b/usr.bin/ssh/ge25519.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ge25519.h,v 1.3 2013/12/09 11:03:45 markus Exp $ */
+/* $OpenBSD: ge25519.h,v 1.4 2015/02/16 18:26:26 miod Exp $ */
/*
* Public Domain, Authors: Daniel J. Bernstein, Niels Duif, Tanja Lange,
@@ -28,7 +28,7 @@ typedef struct
fe25519 t;
} ge25519;
-const ge25519 ge25519_base;
+extern const ge25519 ge25519_base;
int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]);