From ca34a3b04e01145dcc7fadbf91cb29da44e3e7be Mon Sep 17 00:00:00 2001 From: Jay Freeman Date: Wed, 3 Dec 2014 08:55:43 +0000 Subject: Updated openssl and openssh. git-svn-id: http://svn.telesphoreo.org/trunk@797 514c082c-b64e-11dc-b46d-3d985efe055d --- data/openssh/duplicate.diff | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 data/openssh/duplicate.diff (limited to 'data/openssh/duplicate.diff') diff --git a/data/openssh/duplicate.diff b/data/openssh/duplicate.diff new file mode 100644 index 000000000..6482334ac --- /dev/null +++ b/data/openssh/duplicate.diff @@ -0,0 +1,24 @@ +diff -ru openssh-6.7p1/ge25519.h openssh-6.7p1+iPhone/ge25519.h +--- openssh-6.7p1/ge25519.h 2013-12-18 06:48:11.000000000 +0000 ++++ openssh-6.7p1+iPhone/ge25519.h 2014-12-03 07:58:12.000000000 +0000 +@@ -28,7 +28,7 @@ + fe25519 t; + } ge25519; + +-const ge25519 ge25519_base; ++extern const ge25519 ge25519_base; + + int ge25519_unpackneg_vartime(ge25519 *r, const unsigned char p[32]); + +diff -ru openssh-6.7p1/umac.c openssh-6.7p1+iPhone/umac.c +--- openssh-6.7p1/umac.c 2014-07-22 23:43:42.000000000 +0000 ++++ openssh-6.7p1+iPhone/umac.c 2014-12-02 23:50:38.000000000 +0000 +@@ -1175,7 +1175,7 @@ + * time. The all-at-once is more optimaized than the sequential version and + * should be preferred when the sequential interface is not required. + */ +-struct umac_ctx { ++typedef struct umac_ctx { + uhash_ctx hash; /* Hash function for message compression */ + pdf_ctx pdf; /* PDF for hashed output */ + void *free_ptr; /* Address to free this struct via */ -- cgit v1.2.3