From a9ad706d82a2735ce721d0997f2eb68ef7fbf1bb Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Fri, 3 Mar 2017 15:51:39 +0100 Subject: [PATCH] Coverity reports applied --- openssh-6.7p1-kdf-cavs.patch | 5 +---- pam_ssh_agent_auth-0.9.3-agent_structure.patch | 5 +++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/openssh-6.7p1-kdf-cavs.patch b/openssh-6.7p1-kdf-cavs.patch index 2f5874a..65feb96 100644 --- a/openssh-6.7p1-kdf-cavs.patch +++ b/openssh-6.7p1-kdf-cavs.patch @@ -40,7 +40,7 @@ diff -up openssh-6.8p1/Makefile.in.kdf-cavs openssh-6.8p1/Makefile.in diff -up openssh-6.8p1/ssh-cavs.c.kdf-cavs openssh-6.8p1/ssh-cavs.c --- openssh-6.8p1/ssh-cavs.c.kdf-cavs 2015-03-18 11:23:46.348049354 +0100 +++ openssh-6.8p1/ssh-cavs.c 2015-03-18 11:23:46.348049354 +0100 -@@ -0,0 +1,383 @@ +@@ -0,0 +1,380 @@ +/* + * Copyright (C) 2015, Stephan Mueller + * @@ -317,9 +317,6 @@ diff -up openssh-6.8p1/ssh-cavs.c.kdf-cavs openssh-6.8p1/ssh-cavs.c + hex, HEXOUTLEN, 0); + printf("Integrity key (server to client) = %s\n", hex); + -+ free(ctoskeys); -+ free(stockeys); -+ +out: + if (Kbn) + BN_free(Kbn); diff --git a/pam_ssh_agent_auth-0.9.3-agent_structure.patch b/pam_ssh_agent_auth-0.9.3-agent_structure.patch index 1cab72c..f4532b5 100644 --- a/pam_ssh_agent_auth-0.9.3-agent_structure.patch +++ b/pam_ssh_agent_auth-0.9.3-agent_structure.patch @@ -25,7 +25,7 @@ diff -up openssh-7.1p2/pam_ssh_agent_auth-0.10.2/iterate_ssh_agent_keys.c.psaa-a #include #include #include "ssh2.h" -@@ -285,36 +286,43 @@ pamsshagentauth_find_authorized_keys(con +@@ -285,36 +286,44 @@ pamsshagentauth_find_authorized_keys(con { Buffer session_id2 = { 0 }; Identity *id; @@ -35,7 +35,8 @@ diff -up openssh-7.1p2/pam_ssh_agent_auth-0.10.2/iterate_ssh_agent_keys.c.psaa-a uint8_t retval = 0; uid_t uid = getpwnam(ruser)->pw_uid; + struct ssh_identitylist *idlist; -+ int r, i; ++ int r; ++ unsigned int i; OpenSSL_add_all_digests(); pamsshagentauth_session_id2_gen(&session_id2, user, ruser, servicename);