krb5_c_make_checksum allocates the output memory. remove all code which preallocates it

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/marc-3des@10966 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/crypto/verify_checksum.c b/src/lib/crypto/verify_checksum.c
index 0a147f4cb015ed61e440e97ca0ba85a729d42130..4bc8fa3c3a69532c4a154ed51e8c828dcc959be7 100644 (file)
--- a/src/lib/crypto/verify_checksum.c
+++ b/src/lib/crypto/verify_checksum.c
@@ -43,8 +43,6 @@ krb5_c_verify_checksum(context, key, usage, data, cksum, valid)
        return(KRB5_BAD_MSIZE);
 
     computed.length = hashsize;
-    if ((computed.contents = (krb5_octet *) malloc(computed.length)) == NULL)
-       return(ENOMEM);
 
     if (ret = krb5_c_make_checksum(context, cksum->checksum_type, key, usage,
                                   data, &computed)) {

diff --git a/src/lib/krb5/krb/mk_req_ext.c b/src/lib/krb5/krb/mk_req_ext.c
index 98a67f884ba971790231856f2719e9a0d22c67ba..1530f79616e910ccb13d2abf2094eecb2eef116e 100644 (file)
--- a/src/lib/krb5/krb/mk_req_ext.c
+++ b/src/lib/krb5/krb/mk_req_ext.c
@@ -81,7 +81,6 @@ krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
     krb5_checksum        checksum;
     krb5_checksum        *checksump = 0;
     krb5_auth_context    new_auth_context;
-    size_t               cksumlen;
 
     krb5_ap_req request;
     krb5_data *scratch = 0;
@@ -136,17 +135,6 @@ krb5_mk_req_extended(context, auth_context, ap_req_options, in_data, in_creds,
            checksum.length = in_data->length;
            checksum.contents = (krb5_octet *) in_data->data;
        } else {
-           if ((retval=krb5_c_checksum_length(context,
-                                              (*auth_context)->req_cksumtype,
-                                              &cksumlen)))
-               goto cleanup;
-
-           /* Generate checksum, XXX What should the seed be? */
-           checksum.length = cksumlen;
-           if ((checksum.contents = (krb5_octet *)malloc(checksum.length)) == NULL) {
-               retval = ENOMEM;
-               goto cleanup;
-           }
            if ((retval = krb5_c_make_checksum(context, 
                                               (*auth_context)->req_cksumtype,
                                               (*auth_context)->keyblock,

diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index 0bbd78bf2674bc3ab7d3a48be12555af7611d1b9..0d5a4908045fb7bf718b23dd1a8167ac57cbb6d6 100644 (file)
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -60,7 +60,6 @@ krb5_mk_safe_basic(context, userdata, keyblock, replaydata, local_addr,
     krb5_octet zero_octet = 0;
     krb5_checksum safe_checksum;
     krb5_data *scratch1, *scratch2;
-    size_t sumlen;
 
     if (!valid_cksumtype(sumtype))
        return KRB5_PROG_SUMTYPE_NOSUPP;
@@ -91,17 +90,6 @@ krb5_mk_safe_basic(context, userdata, keyblock, replaydata, local_addr,
     if ((retval = encode_krb5_safe(&safemsg, &scratch1)))
        return retval;
 
-    if ((retval = krb5_c_checksum_length(context, sumtype, &sumlen)))
-       goto cleanup_scratch;
-
-    safe_checksum.length = sumlen;
-
-    if (!(safe_checksum.contents = (krb5_octet *) malloc(safe_checksum.length))) {
-
-       retval = ENOMEM;
-       goto cleanup_scratch;
-    }
-
     if ((retval = krb5_c_make_checksum(context, sumtype, keyblock,
                                       KRB5_KEYUSAGE_KRB_SAFE_CKSUM,
                                       scratch1, &safe_checksum)))

diff --git a/src/lib/krb5/krb/send_tgs.c b/src/lib/krb5/krb/send_tgs.c
index 10bd379984f111fd35163b5c06beafaf2252ace9..19de14e1aa6ad0f64d520ab1c34ca0dc377c9b43 100644 (file)
--- a/src/lib/krb5/krb/send_tgs.c
+++ b/src/lib/krb5/krb/send_tgs.c
@@ -57,17 +57,8 @@ krb5_send_tgs_basic(context, in_data, in_cred, outbuf)
     krb5_ap_req          request;
     krb5_data          * scratch;
     krb5_data           * toutbuf;
-    size_t               sumlen;
-
-    if ((retval = krb5_c_checksum_length(context, context->kdc_req_sumtype,
-                                        &sumlen)))
-       return(retval);
 
     /* Generate checksum */
-    checksum.length = krb5_checksum_size(context, context->kdc_req_sumtype);
-    if ((checksum.contents = (krb5_octet *) malloc(checksum.length)) == NULL)
-        return(ENOMEM);
-
     if ((retval = krb5_c_make_checksum(context, context->kdc_req_sumtype,
                                       &in_cred->keyblock,
                                       KRB5_KEYUSAGE_TGS_REQ_AUTH_CKSUM,