diff options
Diffstat (limited to 'data/openssh/duplicate.diff')
| -rw-r--r-- | data/openssh/duplicate.diff | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/data/openssh/duplicate.diff b/data/openssh/duplicate.diff index 6482334ac..108caf046 100644 --- a/data/openssh/duplicate.diff +++ b/data/openssh/duplicate.diff @@ -1,24 +1,12 @@ -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; +diff -ur openssh-7.7p1/session.c openssh-7.7p1+iPhone/session.c +--- openssh-7.7p1/session.c 2018-04-01 19:38:28.000000000 -1000 ++++ openssh-7.7p1+iPhone/session.c 2018-07-24 12:09:29.000000000 -1000 +@@ -141,7 +141,7 @@ + extern void destroy_sensitive_data(void); + extern Buffer loginmsg; + extern struct sshauthopt *auth_opts; +-char *tun_fwd_ifnames; /* serverloop.c */ ++extern char *tun_fwd_ifnames; /* serverloop.c */ --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 */ + /* original command from peer. */ + const char *original_command = NULL; |