- markus@cvs.openbsd.org 2002/07/04 10:41:47

     [key.c monitor_wrap.c ssh-dss.c ssh-rsa.c]
     don't allocate, copy, and discard if there is not interested in the data;
     ok deraadt@

1 files changed, 11 insertions, 15 deletions

diff --git a/ssh-dss.c b/ssh-dss.c
index 0215f1c9a..9ba2584dd 100644
--- a/ssh-dss.c
+++ b/ssh-dss.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-dss.c,v 1.16 2002/07/04 04:15:33 deraadt Exp $");
+RCSID("$OpenBSD: ssh-dss.c,v 1.17 2002/07/04 10:41:47 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -46,7 +46,7 @@ ssh_dss_sign(Key *key, u_char **sigp, u_int *lenp,
         DSA_SIG *sig;
         const EVP_MD *evp_md = EVP_sha1();
         EVP_MD_CTX md;
-        u_char *ret, digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
+        u_char digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN];
         u_int rlen, slen, len, dlen;
         Buffer b;
 
@@ -79,29 +79,25 @@ ssh_dss_sign(Key *key, u_char **sigp, u_int *lenp,
         DSA_SIG_free(sig);
 
         if (datafellows & SSH_BUG_SIGBLOB) {
-                ret = xmalloc(SIGBLOB_LEN);
-                memcpy(ret, sigblob, SIGBLOB_LEN);
                 if (lenp != NULL)
                         *lenp = SIGBLOB_LEN;
-                if (sigp != NULL)
-                        *sigp = ret;
-                else
-                        xfree(ret);
+                if (sigp != NULL) {
+                        *sigp = xmalloc(SIGBLOB_LEN);
+                        memcpy(*sigp, sigblob, SIGBLOB_LEN);
+                }
         } else {
                 /* ietf-drafts */
                 buffer_init(&b);
                 buffer_put_cstring(&b, "ssh-dss");
                 buffer_put_string(&b, sigblob, SIGBLOB_LEN);
                 len = buffer_len(&b);
-                ret = xmalloc(len);
-                memcpy(ret, buffer_ptr(&b), len);
-                buffer_free(&b);
                 if (lenp != NULL)
                         *lenp = len;
-                if (sigp != NULL)
-                        *sigp = ret;
-                else
-                        xfree(ret);
+                if (sigp != NULL) {
+                        *sigp = xmalloc(len);
+                        memcpy(*sigp, buffer_ptr(&b), len);
+                }
+                buffer_free(&b);
         }
         return 0;
 }