kentpeacock / rpms / openssh

Forked from rpms/openssh 2 years ago
Clone
b58e57
diff -up openssh-7.4p1/pam_ssh_agent_auth-0.10.3/get_command_line.c.psaa-xfree openssh-7.4p1/pam_ssh_agent_auth-0.10.3/get_command_line.c
b58e57
--- openssh-7.4p1/pam_ssh_agent_auth-0.10.3/get_command_line.c.psaa-xfree	2017-02-13 16:06:46.260653300 +0100
b58e57
+++ openssh-7.4p1/pam_ssh_agent_auth-0.10.3/get_command_line.c	2017-02-13 16:07:22.228619884 +0100
b58e57
@@ -105,9 +105,9 @@ pamsshagentauth_free_command_line(char *
b58e57
 {
b58e57
     size_t i;
b58e57
     for (i = 0; i < n_args; i++)
b58e57
-        pamsshagentauth_xfree(argv[i]);
b58e57
+        free(argv[i]);
b58e57
 
b58e57
-    pamsshagentauth_xfree(argv);
b58e57
+    free(argv);
b58e57
     return;
b58e57
 }
b58e57
 
b58e57
diff -up openssh-7.4p1/pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c.psaa-xfree openssh-7.4p1/pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c
b58e57
--- openssh-7.4p1/pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c.psaa-xfree	2017-02-13 16:06:46.261653299 +0100
b58e57
+++ openssh-7.4p1/pam_ssh_agent_auth-0.10.3/iterate_ssh_agent_keys.c	2017-02-13 16:08:01.263583622 +0100
b58e57
@@ -170,7 +170,7 @@ pamsshagentauth_session_id2_gen(Buffer *
b58e57
     /* pamsshagentauth_debug3("action: %s", action_logbuf); */
b58e57
     pamsshagentauth_buffer_put_string(session_id2, action_agentbuf.buf + action_agentbuf.offset, action_agentbuf.end - action_agentbuf.offset);
b58e57
     if (free_logbuf) { 
b58e57
-        pamsshagentauth_xfree(action_logbuf);
b58e57
+        free(action_logbuf);
b58e57
         pamsshagentauth_buffer_free(&action_agentbuf);
b58e57
     }
b58e57
     /* pamsshagentauth_debug3("hostname: %s", hostname); */
b58e57
@@ -306,9 +306,9 @@ pamsshagentauth_find_authorized_keys(con
b58e57
                 if(userauth_pubkey_from_id(ruser, id, &session_id2)) {
b58e57
                     retval = 1;
b58e57
                 }
b58e57
-                pamsshagentauth_xfree(id->filename);
b58e57
+                free(id->filename);
b58e57
                 pamsshagentauth_key_free(id->key);
b58e57
-                pamsshagentauth_xfree(id);
b58e57
+                free(id);
b58e57
                 if(retval == 1)
b58e57
                     break;
b58e57
             }
b58e57
diff -up openssh-7.4p1/pam_ssh_agent_auth-0.10.3/pam_user_key_allowed2.c.psaa-xfree openssh-7.4p1/pam_ssh_agent_auth-0.10.3/pam_user_key_allowed2.c
b58e57
--- openssh-7.4p1/pam_ssh_agent_auth-0.10.3/pam_user_key_allowed2.c.psaa-xfree	2017-02-13 16:06:46.261653299 +0100
b58e57
+++ openssh-7.4p1/pam_ssh_agent_auth-0.10.3/pam_user_key_allowed2.c	2017-02-13 16:08:25.507561099 +0100
b58e57
@@ -105,7 +105,7 @@ pamsshagentauth_check_authkeys_file(FILE
b58e57
             fp = pamsshagentauth_key_fingerprint(found, SSH_FP_MD5, SSH_FP_HEX);
b58e57
             pamsshagentauth_logit("Found matching %s key: %s",
b58e57
                                   pamsshagentauth_key_type(found), fp);
b58e57
-            pamsshagentauth_xfree(fp);
b58e57
+            free(fp);
b58e57
             break;
b58e57
         }
b58e57
     }
b58e57
diff -up openssh-7.4p1/pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c.psaa-xfree openssh-7.4p1/pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c
b58e57
--- openssh-7.4p1/pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c.psaa-xfree	2017-02-13 16:06:46.261653299 +0100
b58e57
+++ openssh-7.4p1/pam_ssh_agent_auth-0.10.3/userauth_pubkey_from_id.c	2017-02-13 16:08:44.164543767 +0100
b58e57
@@ -93,9 +93,9 @@ userauth_pubkey_from_id(const char *ruse
b58e57
     /* if(&b != NULL) */
b58e57
     pamsshagentauth_buffer_free(&b);
b58e57
     if(sig != NULL)
b58e57
-        pamsshagentauth_xfree(sig);
b58e57
+        free(sig);
b58e57
     if(pkblob != NULL)
b58e57
-        pamsshagentauth_xfree(pkblob);
b58e57
+        free(pkblob);
b58e57
     CRYPTO_cleanup_all_ex_data();
b58e57
     return authenticated;
b58e57
 }