summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormortimer <mortimer@openbsd.org>2021-01-18 00:53:20 +0000
committermortimer <mortimer@openbsd.org>2021-01-18 00:53:20 +0000
commit02d661e94f8086577029205884f2e8f7e50fb4ad (patch)
treeedbd58d48b04d92a824962619b41aacfb7f598c6
parentMove usage definition out of header file to avoid issues with -fno-common. (diff)
downloadwireguard-openbsd-02d661e94f8086577029205884f2e8f7e50fb4ad.tar.xz
wireguard-openbsd-02d661e94f8086577029205884f2e8f7e50fb4ad.zip
Move sessid definition to keynote-verify.c to avoid issues with -fno-common
ok deraadt@
-rw-r--r--lib/libkeynote/header.h4
-rw-r--r--lib/libkeynote/keynote-verify.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/libkeynote/header.h b/lib/libkeynote/header.h
index 04dc1ad659f..3d72629e429 100644
--- a/lib/libkeynote/header.h
+++ b/lib/libkeynote/header.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: header.h,v 1.10 2004/06/29 11:35:56 msf Exp $ */
+/* $OpenBSD: header.h,v 1.11 2021/01/18 00:53:20 mortimer Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -33,7 +33,7 @@ extern int kvparse(void), kvlex(void);
extern void kverror(char *);
/* Variables */
-int sessid;
+extern int sessid;
/* Defines */
#define SEED_LEN 40
diff --git a/lib/libkeynote/keynote-verify.c b/lib/libkeynote/keynote-verify.c
index d6f13f19295..37cc2afbae7 100644
--- a/lib/libkeynote/keynote-verify.c
+++ b/lib/libkeynote/keynote-verify.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: keynote-verify.c,v 1.18 2019/06/28 13:32:42 deraadt Exp $ */
+/* $OpenBSD: keynote-verify.c,v 1.19 2021/01/18 00:53:20 mortimer Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
*
@@ -34,6 +34,8 @@
#include "header.h"
#include "keynote.h"
+int sessid;
+
void verifyusage(void);
void