Renamed MD5 routines to be preceded with krb5_

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7806 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/lib/gssapi/krb5/ChangeLog b/src/lib/gssapi/krb5/ChangeLog
index c1cd9229289d7d0c94eddf397709ccb545a766ec..20348ab4b6afbd4da0b21883cda4100ea4579d82 100644 (file)
--- a/src/lib/gssapi/krb5/ChangeLog
+++ b/src/lib/gssapi/krb5/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr 12 21:47:46 1996  Richard Basch  <basch@lehman.com>
+
+        * k5seal.c k5unseal.c:
+        Renamed MD5 routines to be preceded with krb5_
+
 Thu Apr 11 18:53:09 1996  Theodore Y. Ts'o  <tytso@dcl>
 
        * acquire_cred.c (acquire_init_cred): Return GSS_S_CRED_UNAVAIL on

diff --git a/src/lib/gssapi/krb5/k5seal.c b/src/lib/gssapi/krb5/k5seal.c
index d0589847356f6110f4ba2bafc4001d6cb075752f..bb8818c99e95c552d5d7aa91e7fe8eef6bb49764 100644 (file)
--- a/src/lib/gssapi/krb5/k5seal.c
+++ b/src/lib/gssapi/krb5/k5seal.c
@@ -38,7 +38,7 @@ make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token,
      int bigend;
 {
    krb5_error_code code;
-   MD5_CTX md5;
+   krb5_MD5_CTX md5;
    krb5_checksum desmac;
    int tmsglen, tlen;
    unsigned char *t, *ptr;
@@ -125,22 +125,22 @@ make_seal_token(context, enc_ed, seq_ed, seqnum, direction, text, token,
 
       /* compute the checksum */
 
-      MD5Init(&md5);
-      MD5Update(&md5, (unsigned char *) ptr-2, 8);
+      krb5_MD5Init(&md5);
+      krb5_MD5Update(&md5, (unsigned char *) ptr-2, 8);
       if (bigend)
-        MD5Update(&md5, text->value, text->length);
+        krb5_MD5Update(&md5, text->value, text->length);
       else
-        MD5Update(&md5, plain, tmsglen);
-      MD5Final(&md5);
+        krb5_MD5Update(&md5, plain, tmsglen);
+      krb5_MD5Final(&md5);
 
       xfree(plain);
    } else {
       /* compute the checksum */
 
-      MD5Init(&md5);
-      MD5Update(&md5, (unsigned char *) ptr-2, 8);
-      MD5Update(&md5, text->value, text->length);
-      MD5Final(&md5);
+      krb5_MD5Init(&md5);
+      krb5_MD5Update(&md5, (unsigned char *) ptr-2, 8);
+      krb5_MD5Update(&md5, text->value, text->length);
+      krb5_MD5Final(&md5);
    }
 
    /* XXX this depends on the key being a single-des key, but that's

diff --git a/src/lib/gssapi/krb5/k5unseal.c b/src/lib/gssapi/krb5/k5unseal.c
index 48bc07119087154b3f97b76781e920750f09f370..e8219de3fd5edf3b4a3deb144a67bae03d3df92a 100644 (file)
--- a/src/lib/gssapi/krb5/k5unseal.c
+++ b/src/lib/gssapi/krb5/k5unseal.c
@@ -49,7 +49,7 @@ kg_unseal(context, minor_status, context_handle, input_token_buffer,
    gss_buffer_desc token;
    unsigned char *ptr;
    krb5_checksum desmac;
-   MD5_CTX md5;
+   krb5_MD5_CTX md5;
    unsigned char *cksum;
    krb5_timestamp now;
    unsigned char *plain;
@@ -161,13 +161,13 @@ kg_unseal(context, minor_status, context_handle, input_token_buffer,
    if (signalg == 0) {
       /* compute the checksum of the message */
 
-      MD5Init(&md5);
-      MD5Update(&md5, (unsigned char *) ptr-2, 8);
+      krb5_MD5Init(&md5);
+      krb5_MD5Update(&md5, (unsigned char *) ptr-2, 8);
       if (ctx->big_endian)
-        MD5Update(&md5, token.value, token.length);
+        krb5_MD5Update(&md5, token.value, token.length);
       else
-        MD5Update(&md5, plain, plainlen);
-      MD5Final(&md5);
+        krb5_MD5Update(&md5, plain, plainlen);
+      krb5_MD5Final(&md5);
 
       if (sealalg == 0)
         xfree(plain);
@@ -199,14 +199,14 @@ kg_unseal(context, minor_status, context_handle, input_token_buffer,
         ctx->seed_init = 1;
       }
 
-      MD5Init(&md5);
-      MD5Update(&md5, ctx->seed, sizeof(ctx->seed));
-      MD5Update(&md5, (unsigned char *) ptr-2, 8);
+      krb5_MD5Init(&md5);
+      krb5_MD5Update(&md5, ctx->seed, sizeof(ctx->seed));
+      krb5_MD5Update(&md5, (unsigned char *) ptr-2, 8);
       if (ctx->big_endian)
-        MD5Update(&md5, token.value, token.length);
+        krb5_MD5Update(&md5, token.value, token.length);
       else
-        MD5Update(&md5, plain, plainlen);
-      MD5Final(&md5);
+        krb5_MD5Update(&md5, plain, plainlen);
+      krb5_MD5Final(&md5);
 
       if (sealalg == 0)
         xfree(plain);