diff -Nru apr-util/crypto/apr_hmac_md5.c apr-util-hmac-md5/crypto/apr_hmac_md5.c
--- apr-util/crypto/apr_hmac_md5.c Thu Jan 1 01:00:00 1970
+++ apr-util-hmac-md5/crypto/apr_hmac_md5.c Tue Jun 5 01:42:34 2001
@@ -0,0 +1,143 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
+#include "apr_hmac_md5.h"
+
+/**
+ *
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5_init(apr_hmac_md5_ctx_t *context,
+ const unsigned char *key,
+ apr_size_t keyLen)
+{
+ unsigned char inner_padding[64];
+ unsigned char key_digest[MD5_DIGESTSIZE];
+
+ if (key_size > 64) {
+ apr_md5(key_digest, key, keyLen);
+ key = key_digest;
+ key_size = sizeof(key_digest);
+ }
+
+ memset(inner_padding, 0x36, sizeof(inner_padding));
+ memset(context->outer_padding, 0x5c, sizeof(context->outer_padding));
+
+ while (key_size-- > 0) {
+ inner_padding[key_size] ^= key[key_size];
+ context->outer_padding[key_size] ^= key[key_size];
+ }
+
+ apr_md5_init(&context->md5_context);
+ apr_md5_update(&context->md5_context, inner_padding, sizeof(inner_padding));
+
+ return APR_SUCCESS;
+}
+
+/**
+ *
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5_update(apr_hmac_md5_ctx_t *context,
+ const unsigned char *input,
+ apr_size_t inputLen)
+{
+ return apr_md5_update(&context->md5_context, data, size);
+}
+
+/**
+ *
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5_final(unsigned char digest[MD5_DIGESTSIZE],
+ apr_hmac_md5_ctx_t *context)
+{
+ apr_md5_ctx_t md5_context;
+
+ apr_md5_final(digest, &context->md5_context);
+
+ apr_md5_init(&md5_context);
+ apr_md5_update(&md5_context, context->outer_padding,
+ sizof(context->outer_padding));
+ apr_md5_update(&md5_context, digest, sizeof(digest));
+ apr_md5_final(digest, &md5_context);
+
+ /* Zeroize sensitive information. */
+ memset(context, 0, sizeof(*context));
+
+ return APR_SUCCESS;
+}
+
+/**
+ *
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5(unsigned char digest[MD5_DIGESTSIZE],
+ const unsigned char *key,
+ apr_size_t keyLen,
+ const unsigned char *input,
+ apr_size_t inputLen)
+{
+ apr_hmac_md5_ctx_t context;
+ apr_status_t rv;
+
+ if ((rv = apr_hmac_md5_init(&context, key, keyLen)) != APR_SUCCESS)
+ return rv;
+
+ if ((rv = apr_hmac_md5_update(&context, input, inputLen)) != APR_SUCCESS)
+ return rv;
+
+ return apr_hmac_md5_final(digest, &context);
+}
+
diff -Nru apr-util/include/apr_hmac_md5.h apr-util-hmac-md5/include/apr_hmac_md5.h
--- apr-util/include/apr_hmac_md5.h Thu Jan 1 01:00:00 1970
+++ apr-util-hmac-md5/include/apr_hmac_md5.h Tue Jun 5 01:33:25 2001
@@ -0,0 +1,125 @@
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000-2001 The Apache Software Foundation. All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * Alternately, this acknowledgment may appear in the software itself,
+ * if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ * not be used to endorse or promote products derived from this
+ * software without prior written permission. For written
+ * permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ * nor may "Apache" appear in their name, without prior written
+ * permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * .
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
+
+#ifndef APR_HMAC_MD5_H
+#define APR_HMAC_MD5_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @package Apache HMAC MD5 routines
+ */
+
+#include "apu.h"
+#include "apr_md5.h"
+
+typedef struct apr_hmac_md5_ctx_t
+{
+ apr_md5_ctx_t md5_context;
+ unsigned char outer_padding[64];
+} apr_hmac_md5_ctx_t;
+
+/**
+ * HMAC MD5 initialization
+ * @param context The HMAC MD5 context
+ * @param key The key to use
+ * @param keyLen The length of the key
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5_init(apr_hmac_md5_ctx_t *context,
+ const unsigned char *key,
+ apr_size_t keyLen);
+
+/**
+ * HMAC MD5 update
+ * @param context The HMAC MD5 context
+ * @param input The message block to update
+ * @param inputLen The length of the message block
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5_update(apr_hmac_md5_ctx_t *context,
+ const unsigned char *input,
+ apr_size_t inputLen);
+
+/**
+ * HMAC MD5 finalize
+ * @param digest The HMAC MD5 digest
+ * @param context The HMAC MD5 context
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5_final(unsigned char digest[MD5_DIGESTSIZE],
+ apr_hmac_md5_ctx_t *context);
+
+/**
+ * HMAC MD5 computation in one call (init, update, final)
+ * @param digest The HMAC MD5 digest
+ * @param key The key to use
+ * @param keyLen The length of the key
+ * @param input The message block to use
+ * @param inputLen The length of the message block
+ */
+APU_DECLARE(apr_status_t) apr_hmac_md5(unsigned char digest[MD5_DIGESTSIZE],
+ const unsigned char *key,
+ apr_size_t keyLen,
+ const unsigned char *input,
+ apr_size_t inputLen);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* !APR_HMAC_MD5_H */