[Pkg-voip-commits] r9946 - in /kamailio/trunk/debian: ./ patches/ patches/upstream/
maniac-guest at alioth.debian.org
maniac-guest at alioth.debian.org
Tue Sep 4 06:48:22 UTC 2012
Author: maniac-guest
Date: Tue Sep 4 06:48:22 2012
New Revision: 9946
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9946
Log:
Upstream fixes. md5 patches merged upstream
Added:
kamailio/trunk/debian/patches/upstream/0022-modules_k-nathelper-fix-a-lines-inserted-out-of-orde.patch
kamailio/trunk/debian/patches/upstream/0024-lib-srdb1-put-pooling-constans-into-separate-header-.patch
kamailio/trunk/debian/patches/upstream/0027-modules-dialplan-always-set-type-of-attrs-pvar-value.patch
kamailio/trunk/debian/patches/upstream/0028-kamailio.cfg-use-add_contact_alias-handle_uri_alias-.patch
kamailio/trunk/debian/patches/upstream/0029-Add-Record-Route-for-in-dialog-NOTIFY-as-per-RFC-666.patch
kamailio/trunk/debian/patches/upstream/0030-Process-CANCEL-before-in-dialog-requests.-This-preve.patch
kamailio/trunk/debian/patches/upstream/0031-core-Use-Colin-Plumb-s-MD5-implementation.patch
kamailio/trunk/debian/patches/upstream/0032-core-added-md5-wrapper-functions-to-build-with-Colin.patch
kamailio/trunk/debian/patches/upstream/0033-b-f-In-case-of-IPv6-Option-in-the-RTP-Command-the-po.patch
Modified:
kamailio/trunk/debian/changelog
kamailio/trunk/debian/patches/series
Modified: kamailio/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/changelog?rev=9946&op=diff
==============================================================================
--- kamailio/trunk/debian/changelog (original)
+++ kamailio/trunk/debian/changelog Tue Sep 4 06:48:22 2012
@@ -6,11 +6,13 @@
* debian/patches/upstream:
+ removed upstream fixes for the previous release.
+ added upstream fixes.
+ + removed plumb_md5.patch and plumb_md5_fixes.patch
+ merged upstream ( Thanks miconda )
* debian/backports/squeeze:
+ remove call to dpkg-buildflags
+ do not apply hardening_flags.patch
- -- Victor Seva <linuxmaniac at torreviejawireless.org> Mon, 20 Aug 2012 09:47:21 +0200
+ -- Victor Seva <linuxmaniac at torreviejawireless.org> Tue, 04 Sep 2012 08:30:15 +0200
kamailio (3.3.0-1) unstable; urgency=low
Modified: kamailio/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/series?rev=9946&op=diff
==============================================================================
--- kamailio/trunk/debian/patches/series (original)
+++ kamailio/trunk/debian/patches/series Tue Sep 4 06:48:22 2012
@@ -12,8 +12,15 @@
upstream/0016-modules-db_postgres-libpq-requires-null-terminated-s.patch
upstream/0017-modules_k-pua-transaction-not-ended-before-calling-s.patch
upstream/0018-modules_k-rls-Some-incorrect-pkg_free-calls-in-DB-on.patch
+upstream/0022-modules_k-nathelper-fix-a-lines-inserted-out-of-orde.patch
+upstream/0024-lib-srdb1-put-pooling-constans-into-separate-header-.patch
+upstream/0027-modules-dialplan-always-set-type-of-attrs-pvar-value.patch
+upstream/0028-kamailio.cfg-use-add_contact_alias-handle_uri_alias-.patch
+upstream/0029-Add-Record-Route-for-in-dialog-NOTIFY-as-per-RFC-666.patch
+upstream/0030-Process-CANCEL-before-in-dialog-requests.-This-preve.patch
+upstream/0031-core-Use-Colin-Plumb-s-MD5-implementation.patch
+upstream/0032-core-added-md5-wrapper-functions-to-build-with-Colin.patch
+upstream/0033-b-f-In-case-of-IPv6-Option-in-the-RTP-Command-the-po.patch
no_lib64_on_64_bits.patch
no_INSTALL_file.patch
-plumb_md5.patch
-plumb_md5_fixes.patch
fix_export.patch
Added: kamailio/trunk/debian/patches/upstream/0022-modules_k-nathelper-fix-a-lines-inserted-out-of-orde.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0022-modules_k-nathelper-fix-a-lines-inserted-out-of-orde.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0022-modules_k-nathelper-fix-a-lines-inserted-out-of-orde.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0022-modules_k-nathelper-fix-a-lines-inserted-out-of-orde.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,58 @@
+From c79aef1753fb02a35f299fd0fb861d82c34226e7 Mon Sep 17 00:00:00 2001
+From: Richard Fuchs <rfuchs at sipwise.com>
+Date: Wed, 29 Aug 2012 15:47:10 -0400
+Subject: [PATCH] modules_k/nathelper: fix a= lines inserted out of order
+
+RFC 4566 dictates a particular order of fields in the SDP body, in particular
+media-specific a= lines must be last fields within an m= block. Inserting
+them right after the m= lines violates this order if other fields (such as
+c=) are present, causing parse errors in some clients. So instead, insert
+them at the end of each m= block.
+---
+ modules_k/nathelper/nathelper.c | 15 +++++----------
+ 1 file changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c
+index bec490c..a7f20a4 100644
+--- a/modules_k/nathelper/nathelper.c
++++ b/modules_k/nathelper/nathelper.c
+@@ -1370,7 +1370,7 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2)
+ str body;
+ str ip;
+ int level, rest_len;
+- char *buf, *m_start, *m_end, *rest_s;
++ char *buf, *m_start, *m_end;
+ struct lump* anchor;
+
+ level = (int)(long)str1;
+@@ -1389,13 +1389,11 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2)
+ if (level & ADD_ADIRECTION) {
+ m_start = ser_memmem(body.s, "\r\nm=", body.len, 4);
+ while (m_start != NULL) {
+- m_start = m_start + 2;
++ m_start += 4;
+ rest_len = body.len - (m_start - body.s);
+- m_end = ser_memmem(m_start, "\r\n", rest_len, 2);
+- if (m_end == NULL) {
+- LM_ERR("m line is not crlf terminated\n");
+- return -1;
+- }
++ m_start = m_end = ser_memmem(m_start, "\r\nm=", rest_len, 4);
++ if (!m_end)
++ m_end = body.s + body.len; /* just before the final \r\n */
+ anchor = anchor_lump(msg, m_end - msg->buf, 0, 0);
+ if (anchor == NULL) {
+ LM_ERR("anchor_lump failed\n");
+@@ -1413,9 +1411,6 @@ fix_nated_sdp_f(struct sip_msg* msg, char* str1, char* str2)
+ pkg_free(buf);
+ return -1;
+ }
+- rest_s = m_end + 2;
+- rest_len = body.len - (rest_s - body.s);
+- m_start = ser_memmem(rest_s, "\r\nm=", rest_len, 4);
+ }
+ }
+
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0024-lib-srdb1-put-pooling-constans-into-separate-header-.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0024-lib-srdb1-put-pooling-constans-into-separate-header-.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0024-lib-srdb1-put-pooling-constans-into-separate-header-.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0024-lib-srdb1-put-pooling-constans-into-separate-header-.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,95 @@
+From 8ad086aa81bc6ca4fb762264ffcc5e53be819ec2 Mon Sep 17 00:00:00 2001
+From: Anca Vamanu <anca.vamanu at 1and1.ro>
+Date: Fri, 13 Jul 2012 16:50:07 +0300
+Subject: [PATCH] lib/srdb1 : put pooling constans into separate header file
+ to reduce include dependancy (cherry picked from commit
+ f3ff581dbd0a53c4c5eafdf829bef0c25e8e8f28)
+
+---
+ lib/srdb1/db.h | 7 +------
+ lib/srdb1/db_id.h | 2 +-
+ lib/srdb1/db_pooling.h | 41 +++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 43 insertions(+), 7 deletions(-)
+ create mode 100644 lib/srdb1/db_pooling.h
+
+diff --git a/lib/srdb1/db.h b/lib/srdb1/db.h
+index 2cbcdf7..0844c05 100644
+--- a/lib/srdb1/db.h
++++ b/lib/srdb1/db.h
+@@ -50,12 +50,7 @@
+ #include "db_cap.h"
+ #include "db_con.h"
+ #include "db_row.h"
+-
+-
+-typedef enum {
+- DB_POOLING_PERMITTED,
+- DB_POOLING_NONE
+-} db_pooling_t;
++#include "db_pooling.h"
+
+ /**
+ * \brief Specify table name that will be used for subsequent operations.
+diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h
+index 13ffc85..6d5a93f 100644
+--- a/lib/srdb1/db_id.h
++++ b/lib/srdb1/db_id.h
+@@ -31,7 +31,7 @@
+ #define _DB1_ID_H
+
+ #include "../../str.h"
+-#include "db.h"
++#include "db_pooling.h"
+
+ /** Structure representing a database ID */
+ struct db_id {
+diff --git a/lib/srdb1/db_pooling.h b/lib/srdb1/db_pooling.h
+new file mode 100644
+index 0000000..30daa49
+--- /dev/null
++++ b/lib/srdb1/db_pooling.h
+@@ -0,0 +1,41 @@
++/*
++ * $Id$
++ *
++ * Copyright (C) 2001-2003 FhG Fokus
++ * Copyright (C) 2007-2008 1&1 Internet AG
++ *
++ * This file is part of Kamailio, a free SIP server.
++ *
++ * Kamailio is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version
++ *
++ * Kamailio is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ */
++
++/**
++ * \file lib/srdb1/db_pooling.h
++ * \ingroup db1
++ * \brief Defines Pooling states
++ *
++ */
++
++#ifndef DB1_POOLING_H
++#define DB1_POOLING_H
++
++
++typedef enum {
++ DB_POOLING_PERMITTED,
++ DB_POOLING_NONE
++} db_pooling_t;
++
++
++#endif /* DB1_POOLING_H */
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0027-modules-dialplan-always-set-type-of-attrs-pvar-value.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0027-modules-dialplan-always-set-type-of-attrs-pvar-value.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0027-modules-dialplan-always-set-type-of-attrs-pvar-value.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0027-modules-dialplan-always-set-type-of-attrs-pvar-value.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,36 @@
+From 5c217004880461e5d121a4b9640539e6bb5bc8bb Mon Sep 17 00:00:00 2001
+From: Juha Heinanen <jh at tutpro.com>
+Date: Sat, 1 Sep 2012 13:32:18 +0300
+Subject: [PATCH] modules/dialplan: always set type of attrs pvar value
+
+- Type of attrs pvar value was not set when dp_translate didn't result
+ in any change.
+(cherry picked from commit 28a7300cd83e135b1c0d5488cb289fc7415fbd8c)
+---
+ modules/dialplan/dialplan.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/modules/dialplan/dialplan.c b/modules/dialplan/dialplan.c
+index 7b9a706..ec8c0e5 100644
+--- a/modules/dialplan/dialplan.c
++++ b/modules/dialplan/dialplan.c
+@@ -277,13 +277,14 @@ static int dp_update(struct sip_msg * msg, pv_spec_t * src, pv_spec_t * dest,
+ int no_change;
+ pv_value_t val;
+
++ memset(&val, 0, sizeof(pv_value_t));
++ val.flags = PV_VAL_STR;
++
+ no_change = (dest->type == PVT_NONE) || (!repl->s) || (!repl->len);
+
+ if (no_change)
+ goto set_attr_pvar;
+
+- memset(&val, 0, sizeof(pv_value_t));
+- val.flags = PV_VAL_STR;
+ val.rs = *repl;
+
+ if(dest->setf(msg, &dest->pvp, (int)EQ_T, &val)<0)
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0028-kamailio.cfg-use-add_contact_alias-handle_uri_alias-.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0028-kamailio.cfg-use-add_contact_alias-handle_uri_alias-.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0028-kamailio.cfg-use-add_contact_alias-handle_uri_alias-.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0028-kamailio.cfg-use-add_contact_alias-handle_uri_alias-.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,60 @@
+From 80e5d5689963ab01a9ab3b3ba7d39f08df59b213 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Fri, 29 Jun 2012 16:06:42 +0200
+Subject: [PATCH] kamailio.cfg: use add_contact_alias()/handle_uri_alias() for
+ NATed calls (cherry picked from commit
+ 9d720b83c9dd27e927627132ec052b15efeba518)
+
+---
+ etc/kamailio.cfg | 15 +++++++++++++--
+ 1 file changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
+index f8b375c..e6f20dc 100644
+--- a/etc/kamailio.cfg
++++ b/etc/kamailio.cfg
+@@ -569,6 +569,7 @@ route[WITHINDLG] {
+ # sequential request withing a dialog should
+ # take the path determined by record-routing
+ if (loose_route()) {
++ route(DLGURI);
+ if (is_method("BYE")) {
+ setflag(FLT_ACC); # do accounting ...
+ setflag(FLT_ACCFAILED); # ... even if the transaction fails
+@@ -736,7 +737,7 @@ route[NATDETECT] {
+ if (is_method("REGISTER")) {
+ fix_nated_register();
+ } else {
+- fix_nated_contact();
++ add_contact_alias();
+ }
+ setflag(FLT_NATS);
+ }
+@@ -766,13 +767,23 @@ route[NATMANAGE] {
+ }
+ if (is_reply()) {
+ if(isbflagset(FLB_NATB)) {
+- fix_nated_contact();
++ add_contact_alias();
+ }
+ }
+ #!endif
+ return;
+ }
+
++# URI update for dialog requests
++route[DLGURI] {
++#!ifdef WITH_NAT
++ if(!isdsturiset()) {
++ handle_ruri_alias();
++ }
++#!endif
++ return;
++}
++
+ # Routing to foreign domains
+ route[SIPOUT] {
+ if (!uri==myself)
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0029-Add-Record-Route-for-in-dialog-NOTIFY-as-per-RFC-666.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0029-Add-Record-Route-for-in-dialog-NOTIFY-as-per-RFC-666.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0029-Add-Record-Route-for-in-dialog-NOTIFY-as-per-RFC-666.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0029-Add-Record-Route-for-in-dialog-NOTIFY-as-per-RFC-666.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,34 @@
+From cd1e3909f03f837a583b9ea30ffd6089b8ba8db2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= <ibc at aliax.net>
+Date: Thu, 16 Aug 2012 16:13:50 +0200
+Subject: [PATCH] Add Record-Route for in-dialog NOTIFY as per RFC 6665.
+ (cherry picked from commit
+ d661028060369e702f5882b6492040bd71fb900a)
+
+---
+ etc/kamailio.cfg | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
+index e6f20dc..1dd4b21 100644
+--- a/etc/kamailio.cfg
++++ b/etc/kamailio.cfg
+@@ -574,10 +574,14 @@ route[WITHINDLG] {
+ setflag(FLT_ACC); # do accounting ...
+ setflag(FLT_ACCFAILED); # ... even if the transaction fails
+ }
+- if ( is_method("ACK") ) {
++ else if ( is_method("ACK") ) {
+ # ACK is forwarded statelessy
+ route(NATMANAGE);
+ }
++ else if ( is_method("NOTIFY") ) {
++ # Add Record-Route for in-dialog NOTIFY as per RFC 6665.
++ record_route();
++ }
+ route(RELAY);
+ } else {
+ if (is_method("SUBSCRIBE") && uri == myself) {
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0030-Process-CANCEL-before-in-dialog-requests.-This-preve.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0030-Process-CANCEL-before-in-dialog-requests.-This-preve.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0030-Process-CANCEL-before-in-dialog-requests.-This-preve.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0030-Process-CANCEL-before-in-dialog-requests.-This-preve.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,43 @@
+From 20dacf5225e63fc8ff573272f41572f452272c7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?I=C3=B1aki=20Baz=20Castillo?= <ibc at aliax.net>
+Date: Thu, 16 Aug 2012 16:17:51 +0200
+Subject: [PATCH] Process CANCEL before in-dialog requests. This prevents
+ issues with some devices sending buggy CANCEL with To-tag
+ when cancelling an initial INVITE. (cherry picked from
+ commit 8a7a06f4d9c78f6da0558806d988c817fd6d0018)
+
+---
+ etc/kamailio.cfg | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg
+index 1dd4b21..619f9ad 100644
+--- a/etc/kamailio.cfg
++++ b/etc/kamailio.cfg
+@@ -452,11 +452,6 @@ request_route {
+ # NAT detection
+ route(NATDETECT);
+
+- # handle requests within SIP dialogs
+- route(WITHINDLG);
+-
+- ### only initial requests (no To tag)
+-
+ # CANCEL processing
+ if (is_method("CANCEL"))
+ {
+@@ -465,6 +460,11 @@ request_route {
+ exit;
+ }
+
++ # handle requests within SIP dialogs
++ route(WITHINDLG);
++
++ ### only initial requests (no To tag)
++
+ t_check_trans();
+
+ # authentication
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0031-core-Use-Colin-Plumb-s-MD5-implementation.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0031-core-Use-Colin-Plumb-s-MD5-implementation.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0031-core-Use-Colin-Plumb-s-MD5-implementation.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0031-core-Use-Colin-Plumb-s-MD5-implementation.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,724 @@
+From fbd4acae2d732908a9624c727b8b0306e1c166cd Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 2 Aug 2012 10:13:00 +0200
+Subject: [PATCH] core: Use Colin Plumb's MD5 implementation
+
+Origin: http://anonscm.debian.org/gitweb/?p=dpkg/dpkg.git;a=summary
+Author: Tzafrir Cohen <tzafrir at debian.org>
+
+Borrowed the md5 code from dpkg instead of the existing md5.[ch]
+
+This makes the code compatible with Debian packing rules and
+restrictions regarding license for distribution
+(cherry picked from commit e6d912ad036aa92604ba3f2bf65cc4c4ba3e4d2f)
+---
+ md5.c | 535 +++++++++++++++++++++++++++--------------------------------------
+ md5.h | 120 ++++-----------
+ 2 files changed, 248 insertions(+), 407 deletions(-)
+
+diff --git a/md5.c b/md5.c
+index d257475..3da18c9 100644
+--- a/md5.c
++++ b/md5.c
+@@ -1,343 +1,252 @@
+-/*
+- * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
+- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+- * rights reserved.
+- * License to copy and use this software is granted provided that it
+- * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+- * Algorithm" in all material mentioning or referencing this software
+- * or this function.
+- *
+- * License is also granted to make and use derivative works provided
+- * that such works are identified as "derived from the RSA Data
+- * Security, Inc. MD5 Message-Digest Algorithm" in all material
+- * mentioning or referencing the derived work.
+- *
+- * RSA Data Security, Inc. makes no representations concerning either
+- * the merchantability of this software or the suitability of this
+- * software for any particular purpose. It is provided "as is"
+- * without express or implied warranty of any kind.
+- *
+- * These notices must be retained in any copies of any part of this
+- * documentation and/or software.
+- */
+-
+-/*!
+- * \file
+- * \brief SIP-router core :: md5 hash support
+- * \ingroup core
+- * Module: \ref core
++/* $OpenBSD: md5.c,v 1.7 2004/05/28 15:10:27 millert Exp $ */
++
++/*
++ * This code implements the MD5 message-digest algorithm.
++ * The algorithm is due to Ron Rivest. This code was
++ * written by Colin Plumb in 1993, no copyright is claimed.
++ * This code is in the public domain; do with it what you wish.
++ *
++ * Equivalent code is available from RSA Data Security, Inc.
++ * This code has been tested against that, and is equivalent,
++ * except that you don't need to include two pages of legalese
++ * with every copy.
++ *
++ * To compute the message digest of a chunk of bytes, declare an
++ * MD5Context structure, pass it to MD5Init, call MD5Update as
++ * needed on buffers full of bytes, and then call MD5Final, which
++ * will fill a supplied 16-byte array with the digest.
+ */
+
++#include <config.h>
++#include <compat.h>
+
++#include <sys/types.h>
+ #include <string.h>
+-#include "md5.h"
+-
+-
+-/**
+- * \name Constants for MD5Transform routine
+- */
+-
+-/*@{ */
+-#define S11 7
+-#define S12 12
+-#define S13 17
+-#define S14 22
+-#define S21 5
+-#define S22 9
+-#define S23 14
+-#define S24 20
+-#define S31 4
+-#define S32 11
+-#define S33 16
+-#define S34 23
+-#define S41 6
+-#define S42 10
+-#define S43 15
+-#define S44 21
+-/*@} */
+
+-static void MD5Transform(unsigned int [4], unsigned char [64]);
+-static void Encode(unsigned char *, unsigned int *, unsigned int);
+-static void Decode(unsigned int *, unsigned char *, unsigned int);
++#include "md5.h"
+
+-static unsigned char PADDING[64] = {
+- 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
++#define PUT_64BIT_LE(cp, value) do { \
++ (cp)[7] = (value) >> 56; \
++ (cp)[6] = (value) >> 48; \
++ (cp)[5] = (value) >> 40; \
++ (cp)[4] = (value) >> 32; \
++ (cp)[3] = (value) >> 24; \
++ (cp)[2] = (value) >> 16; \
++ (cp)[1] = (value) >> 8; \
++ (cp)[0] = (value); } while (0)
++
++#define PUT_32BIT_LE(cp, value) do { \
++ (cp)[3] = (value) >> 24; \
++ (cp)[2] = (value) >> 16; \
++ (cp)[1] = (value) >> 8; \
++ (cp)[0] = (value); } while (0)
++
++static u_int8_t PADDING[MD5_BLOCK_LENGTH] = {
++ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
++ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+ };
+
+-/**
+- * \name F, G, H and I are basic MD5 functions
+- */
+-
+-/*@{ */
+-#define F(x, y, z) (((x) & (y)) | ((~x) & (z)))
+-#define G(x, y, z) (((x) & (z)) | ((y) & (~z)))
+-#define H(x, y, z) ((x) ^ (y) ^ (z))
+-#define I(x, y, z) ((y) ^ ((x) | (~z)))
+-/*@} */
+-
+-/**
+- * \brief ROTATE_LEFT rotates x left n bits
+- */
+-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32-(n))))
+-
+-/**
+- * \name FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4
+- * FF, GG, HH, and II transformations for rounds 1, 2, 3, and 4.
+- * Rotation is separate from addition to prevent recomputation.
+- */
+-
+-/*@{ */
+-#define FF(a, b, c, d, x, s, ac) { \
+- (a) += F ((b), (c), (d)) + (x) + (unsigned int)(ac); \
+- (a) = ROTATE_LEFT ((a), (s)); \
+- (a) += (b); \
+- }
+-#define GG(a, b, c, d, x, s, ac) { \
+- (a) += G ((b), (c), (d)) + (x) + (unsigned int)(ac); \
+- (a) = ROTATE_LEFT ((a), (s)); \
+- (a) += (b); \
+- }
+-#define HH(a, b, c, d, x, s, ac) { \
+- (a) += H ((b), (c), (d)) + (x) + (unsigned int)(ac); \
+- (a) = ROTATE_LEFT ((a), (s)); \
+- (a) += (b); \
+- }
+-#define II(a, b, c, d, x, s, ac) { \
+- (a) += I ((b), (c), (d)) + (x) + (unsigned int)(ac); \
+- (a) = ROTATE_LEFT ((a), (s)); \
+- (a) += (b); \
+- }
+-/*@} */
+-
+-/**
+- * \brief MD5 context initialization
+- *
+- * MD5 context initialization. Begins an MD5 operation, writing a new context.
+- * \param context initialized context
++/*
++ * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious
++ * initialization constants.
+ */
+-void MD5Init (MD5_CTX *context)
++void
++MD5Init(MD5_CTX *ctx)
+ {
+- context->count[0] = context->count[1] = 0;
+- /* Load magic initialization constants.
+-*/
+- context->state[0] = 0x67452301;
+- context->state[1] = 0xefcdab89;
+- context->state[2] = 0x98badcfe;
+- context->state[3] = 0x10325476;
++ ctx->count = 0;
++ ctx->state[0] = 0x67452301;
++ ctx->state[1] = 0xefcdab89;
++ ctx->state[2] = 0x98badcfe;
++ ctx->state[3] = 0x10325476;
+ }
+
+-/**
+- * \brief MD5 block update operation
+- *
+- * MD5 block update operation. Continues an MD5 message-digest
+- * operation, processing another message block, and updating the
+- * context.
+- * \param context context
+- * \param input input block
+- * \param inputLen length of input block
++/*
++ * Update context to reflect the concatenation of another buffer full
++ * of bytes.
+ */
+-void U_MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen)
++void
++MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len)
+ {
+- unsigned int i, index, partLen;
+-
+- /* Compute number of bytes mod 64 */
+- index = (unsigned int)((context->count[0] >> 3) & 0x3F);
+-
+- /* Update number of bits */
+- if ((context->count[0] += ((unsigned int)inputLen << 3))
+-
+- < ((unsigned int)inputLen << 3))
+- context->count[1]++;
+- context->count[1] += ((unsigned int)inputLen >> 29);
+-
+- partLen = 64 - index;
+-
+- /* Transform as many times as possible.
+-*/
+- if (inputLen >= partLen) {
+- memcpy
+- ((unsigned char *)&context->buffer[index], (unsigned char *)input, partLen);
+- MD5Transform (context->state, context->buffer);
+-
+- for (i = partLen; i + 63 < inputLen; i += 64)
+- MD5Transform (context->state, &input[i]);
+-
+- index = 0;
+- }
+- else
+- i = 0;
+-
+- /* Buffer remaining input */
+- memcpy
+- ((unsigned char *)&context->buffer[index], (unsigned char *)&input[i],
+- inputLen-i);
++ size_t have, need;
++
++ /* Check how many bytes we already have and how many more we need. */
++ have = (size_t)((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1));
++ need = MD5_BLOCK_LENGTH - have;
++
++ /* Update bitcount */
++ ctx->count += (u_int64_t)len << 3;
++
++ if (len >= need) {
++ if (have != 0) {
++ memcpy(ctx->buffer + have, input, need);
++ MD5Transform(ctx->state, ctx->buffer);
++ input += need;
++ len -= need;
++ have = 0;
++ }
++
++ /* Process data in MD5_BLOCK_LENGTH-byte chunks. */
++ while (len >= MD5_BLOCK_LENGTH) {
++ MD5Transform(ctx->state, input);
++ input += MD5_BLOCK_LENGTH;
++ len -= MD5_BLOCK_LENGTH;
++ }
++ }
++
++ /* Handle any remaining bytes of data. */
++ if (len != 0)
++ memcpy(ctx->buffer + have, input, len);
+ }
+
+-/**
+- * \brief MD5 finalization
+- *
+- * MD5 finalization. Ends an MD5 message-digest operation, writing the
+- * the message digest and zeroizing the context.
+- * \param digest message digest
+- * \param context context
++/*
++ * Pad pad to 64-byte boundary with the bit pattern
++ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+-void U_MD5Final (unsigned char digest[16], MD5_CTX *context)
++void
++MD5Pad(MD5_CTX *ctx)
+ {
+- unsigned char bits[8];
+- unsigned int index, padLen;
+-
+- /* Save number of bits */
+- Encode (bits, context->count, 8);
+-
+- /* Pad out to 56 mod 64.
+-*/
+- index = (unsigned int)((context->count[0] >> 3) & 0x3f);
+- padLen = (index < 56) ? (56 - index) : (120 - index);
+- U_MD5Update (context, PADDING, padLen);
+-
+- /* Append length (before padding) */
+- U_MD5Update (context, bits, 8);
+-
+- /* Store state in digest */
+- Encode (digest, context->state, 16);
+-
+- /* Zeroize sensitive information.
+-*/
+- memset ((unsigned char *)context, 0, sizeof (*context));
++ u_int8_t count[8];
++ size_t padlen;
++
++ /* Convert count to 8 bytes in little endian order. */
++ PUT_64BIT_LE(count, ctx->count);
++
++ /* Pad out to 56 mod 64. */
++ padlen = MD5_BLOCK_LENGTH -
++ ((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1));
++ if (padlen < 1 + 8)
++ padlen += MD5_BLOCK_LENGTH;
++ MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */
++ MD5Update(ctx, count, 8);
+ }
+
+-/**
+- * \brief MD5 basic transformation
+- *
+- * MD5 basic transformation. Transforms state based on block.
+- * \param state transformed state
+- * \param block block input for transformation
++/*
++ * Final wrapup--call MD5Pad, fill in digest and zero out ctx.
+ */
+-static void MD5Transform (unsigned int state[4], unsigned char block[64])
++void
++MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx)
+ {
+- unsigned int a = state[0], b = state[1], c = state[2], d = state[3], x[16];
+-
+- Decode (x, block, 64);
+-
+- /* Round 1 */
+- FF (a, b, c, d, x[ 0], S11, 0xd76aa478); /* 1 */
+- FF (d, a, b, c, x[ 1], S12, 0xe8c7b756); /* 2 */
+- FF (c, d, a, b, x[ 2], S13, 0x242070db); /* 3 */
+- FF (b, c, d, a, x[ 3], S14, 0xc1bdceee); /* 4 */
+- FF (a, b, c, d, x[ 4], S11, 0xf57c0faf); /* 5 */
+- FF (d, a, b, c, x[ 5], S12, 0x4787c62a); /* 6 */
+- FF (c, d, a, b, x[ 6], S13, 0xa8304613); /* 7 */
+- FF (b, c, d, a, x[ 7], S14, 0xfd469501); /* 8 */
+- FF (a, b, c, d, x[ 8], S11, 0x698098d8); /* 9 */
+- FF (d, a, b, c, x[ 9], S12, 0x8b44f7af); /* 10 */
+- FF (c, d, a, b, x[10], S13, 0xffff5bb1); /* 11 */
+- FF (b, c, d, a, x[11], S14, 0x895cd7be); /* 12 */
+- FF (a, b, c, d, x[12], S11, 0x6b901122); /* 13 */
+- FF (d, a, b, c, x[13], S12, 0xfd987193); /* 14 */
+- FF (c, d, a, b, x[14], S13, 0xa679438e); /* 15 */
+- FF (b, c, d, a, x[15], S14, 0x49b40821); /* 16 */
+-
+- /* Round 2 */
+- GG (a, b, c, d, x[ 1], S21, 0xf61e2562); /* 17 */
+- GG (d, a, b, c, x[ 6], S22, 0xc040b340); /* 18 */
+- GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */
+- GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */
+- GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */
+- GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */
+- GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */
+- GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */
+- GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */
+- GG (d, a, b, c, x[14], S22, 0xc33707d6); /* 26 */
+- GG (c, d, a, b, x[ 3], S23, 0xf4d50d87); /* 27 */
+- GG (b, c, d, a, x[ 8], S24, 0x455a14ed); /* 28 */
+- GG (a, b, c, d, x[13], S21, 0xa9e3e905); /* 29 */
+- GG (d, a, b, c, x[ 2], S22, 0xfcefa3f8); /* 30 */
+- GG (c, d, a, b, x[ 7], S23, 0x676f02d9); /* 31 */
+- GG (b, c, d, a, x[12], S24, 0x8d2a4c8a); /* 32 */
+-
+- /* Round 3 */
+- HH (a, b, c, d, x[ 5], S31, 0xfffa3942); /* 33 */
+- HH (d, a, b, c, x[ 8], S32, 0x8771f681); /* 34 */
+- HH (c, d, a, b, x[11], S33, 0x6d9d6122); /* 35 */
+- HH (b, c, d, a, x[14], S34, 0xfde5380c); /* 36 */
+- HH (a, b, c, d, x[ 1], S31, 0xa4beea44); /* 37 */
+- HH (d, a, b, c, x[ 4], S32, 0x4bdecfa9); /* 38 */
+- HH (c, d, a, b, x[ 7], S33, 0xf6bb4b60); /* 39 */
+- HH (b, c, d, a, x[10], S34, 0xbebfbc70); /* 40 */
+- HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */
+- HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */
+- HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */
+- HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */
+- HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */
+- HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */
+- HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */
+- HH (b, c, d, a, x[ 2], S34, 0xc4ac5665); /* 48 */
+-
+- /* Round 4 */
+- II (a, b, c, d, x[ 0], S41, 0xf4292244); /* 49 */
+- II (d, a, b, c, x[ 7], S42, 0x432aff97); /* 50 */
+- II (c, d, a, b, x[14], S43, 0xab9423a7); /* 51 */
+- II (b, c, d, a, x[ 5], S44, 0xfc93a039); /* 52 */
+- II (a, b, c, d, x[12], S41, 0x655b59c3); /* 53 */
+- II (d, a, b, c, x[ 3], S42, 0x8f0ccc92); /* 54 */
+- II (c, d, a, b, x[10], S43, 0xffeff47d); /* 55 */
+- II (b, c, d, a, x[ 1], S44, 0x85845dd1); /* 56 */
+- II (a, b, c, d, x[ 8], S41, 0x6fa87e4f); /* 57 */
+- II (d, a, b, c, x[15], S42, 0xfe2ce6e0); /* 58 */
+- II (c, d, a, b, x[ 6], S43, 0xa3014314); /* 59 */
+- II (b, c, d, a, x[13], S44, 0x4e0811a1); /* 60 */
+- II (a, b, c, d, x[ 4], S41, 0xf7537e82); /* 61 */
+- II (d, a, b, c, x[11], S42, 0xbd3af235); /* 62 */
+- II (c, d, a, b, x[ 2], S43, 0x2ad7d2bb); /* 63 */
+- II (b, c, d, a, x[ 9], S44, 0xeb86d391); /* 64 */
++ int i;
++
++ MD5Pad(ctx);
++ if (digest != NULL) {
++ for (i = 0; i < 4; i++)
++ PUT_32BIT_LE(digest + i * 4, ctx->state[i]);
++ memset(ctx, 0, sizeof(*ctx));
++ }
++}
+
+- state[0] += a;
+- state[1] += b;
+- state[2] += c;
+- state[3] += d;
+
+- /* Zeroize sensitive information.
+-*/
+- memset ((unsigned char *)x, 0, sizeof (x));
+-}
++/* The four core functions - F1 is optimized somewhat */
+
+-/**
+- * \brief Encodes input (unsigned int) into output (unsigned char)
+- *
+- * Encodes input (unsigned int) into output (unsigned char). Assumes len is
+- * a multiple of 4.
+- * \param output output character
+- * \param input integer input
+- * \param len length of output
+- */
+-static void Encode (unsigned char *output, unsigned int *input, unsigned int len)
+-{
+- unsigned int i, j;
++/* #define F1(x, y, z) (x & y | ~x & z) */
++#define F1(x, y, z) (z ^ (x & (y ^ z)))
++#define F2(x, y, z) F1(z, x, y)
++#define F3(x, y, z) (x ^ y ^ z)
++#define F4(x, y, z) (y ^ (x | ~z))
+
+- for (i = 0, j = 0; j < len; i++, j += 4) {
+- output[j] = (unsigned char)(input[i] & 0xff);
+- output[j+1] = (unsigned char)((input[i] >> 8) & 0xff);
+- output[j+2] = (unsigned char)((input[i] >> 16) & 0xff);
+- output[j+3] = (unsigned char)((input[i] >> 24) & 0xff);
+- }
+-}
++/* This is the central step in the MD5 algorithm. */
++#define MD5STEP(f, w, x, y, z, data, s) \
++ ( w += f(x, y, z) + data, w = w<<s | w>>(32-s), w += x )
+
+-/**
+- * \brief Decodes input (unsigned char) into output (unsigned int)
+- *
+- * Decodes input (unsigned char) into output (unsigned int). Assumes len is
+- * a multiple of 4.
+- * \param output output integer
+- * \param input input character
+- * \param len length of input
++/*
++ * The core of the MD5 algorithm, this alters an existing MD5 hash to
++ * reflect the addition of 16 longwords of new data. MD5Update blocks
++ * the data and converts bytes into longwords for this routine.
+ */
+-static void Decode (unsigned int *output, unsigned char *input, unsigned int len)
++void
++MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH])
+ {
+- unsigned int i, j;
+-
+- for (i = 0, j = 0; j < len; i++, j += 4)
+- output[i] = ((unsigned int)input[j]) | (((unsigned int)input[j+1]) << 8) |
+- (((unsigned int)input[j+2]) << 16) | (((unsigned int)input[j+3]) << 24);
++ u_int32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4];
++
++#ifndef WORDS_BIGENDIAN
++ memcpy(in, block, sizeof(in));
++#else
++ for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) {
++ in[a] = (u_int32_t)(
++ (u_int32_t)(block[a * 4 + 0]) |
++ (u_int32_t)(block[a * 4 + 1]) << 8 |
++ (u_int32_t)(block[a * 4 + 2]) << 16 |
++ (u_int32_t)(block[a * 4 + 3]) << 24);
++ }
++#endif
++
++ a = state[0];
++ b = state[1];
++ c = state[2];
++ d = state[3];
++
++ MD5STEP(F1, a, b, c, d, in[ 0] + 0xd76aa478, 7);
++ MD5STEP(F1, d, a, b, c, in[ 1] + 0xe8c7b756, 12);
++ MD5STEP(F1, c, d, a, b, in[ 2] + 0x242070db, 17);
++ MD5STEP(F1, b, c, d, a, in[ 3] + 0xc1bdceee, 22);
++ MD5STEP(F1, a, b, c, d, in[ 4] + 0xf57c0faf, 7);
++ MD5STEP(F1, d, a, b, c, in[ 5] + 0x4787c62a, 12);
++ MD5STEP(F1, c, d, a, b, in[ 6] + 0xa8304613, 17);
++ MD5STEP(F1, b, c, d, a, in[ 7] + 0xfd469501, 22);
++ MD5STEP(F1, a, b, c, d, in[ 8] + 0x698098d8, 7);
++ MD5STEP(F1, d, a, b, c, in[ 9] + 0x8b44f7af, 12);
++ MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
++ MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22);
++ MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7);
++ MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12);
++ MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17);
++ MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22);
++
++ MD5STEP(F2, a, b, c, d, in[ 1] + 0xf61e2562, 5);
++ MD5STEP(F2, d, a, b, c, in[ 6] + 0xc040b340, 9);
++ MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14);
++ MD5STEP(F2, b, c, d, a, in[ 0] + 0xe9b6c7aa, 20);
++ MD5STEP(F2, a, b, c, d, in[ 5] + 0xd62f105d, 5);
++ MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9);
++ MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
++ MD5STEP(F2, b, c, d, a, in[ 4] + 0xe7d3fbc8, 20);
++ MD5STEP(F2, a, b, c, d, in[ 9] + 0x21e1cde6, 5);
++ MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9);
++ MD5STEP(F2, c, d, a, b, in[ 3] + 0xf4d50d87, 14);
++ MD5STEP(F2, b, c, d, a, in[ 8] + 0x455a14ed, 20);
++ MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
++ MD5STEP(F2, d, a, b, c, in[ 2] + 0xfcefa3f8, 9);
++ MD5STEP(F2, c, d, a, b, in[ 7] + 0x676f02d9, 14);
++ MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
++
++ MD5STEP(F3, a, b, c, d, in[ 5] + 0xfffa3942, 4);
++ MD5STEP(F3, d, a, b, c, in[ 8] + 0x8771f681, 11);
++ MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
++ MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23);
++ MD5STEP(F3, a, b, c, d, in[ 1] + 0xa4beea44, 4);
++ MD5STEP(F3, d, a, b, c, in[ 4] + 0x4bdecfa9, 11);
++ MD5STEP(F3, c, d, a, b, in[ 7] + 0xf6bb4b60, 16);
++ MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
++ MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
++ MD5STEP(F3, d, a, b, c, in[ 0] + 0xeaa127fa, 11);
++ MD5STEP(F3, c, d, a, b, in[ 3] + 0xd4ef3085, 16);
++ MD5STEP(F3, b, c, d, a, in[ 6] + 0x04881d05, 23);
++ MD5STEP(F3, a, b, c, d, in[ 9] + 0xd9d4d039, 4);
++ MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
++ MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
++ MD5STEP(F3, b, c, d, a, in[2 ] + 0xc4ac5665, 23);
++
++ MD5STEP(F4, a, b, c, d, in[ 0] + 0xf4292244, 6);
++ MD5STEP(F4, d, a, b, c, in[7 ] + 0x432aff97, 10);
++ MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15);
++ MD5STEP(F4, b, c, d, a, in[5 ] + 0xfc93a039, 21);
++ MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6);
++ MD5STEP(F4, d, a, b, c, in[3 ] + 0x8f0ccc92, 10);
++ MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15);
++ MD5STEP(F4, b, c, d, a, in[1 ] + 0x85845dd1, 21);
++ MD5STEP(F4, a, b, c, d, in[8 ] + 0x6fa87e4f, 6);
++ MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
++ MD5STEP(F4, c, d, a, b, in[6 ] + 0xa3014314, 15);
++ MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
++ MD5STEP(F4, a, b, c, d, in[4 ] + 0xf7537e82, 6);
++ MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10);
++ MD5STEP(F4, c, d, a, b, in[2 ] + 0x2ad7d2bb, 15);
++ MD5STEP(F4, b, c, d, a, in[9 ] + 0xeb86d391, 21);
++
++ state[0] += a;
++ state[1] += b;
++ state[2] += c;
++ state[3] += d;
+ }
+diff --git a/md5.h b/md5.h
+index cf543ec..f624360 100644
+--- a/md5.h
++++ b/md5.h
+@@ -1,102 +1,34 @@
++/* $OpenBSD: md5.h,v 1.15 2004/05/03 17:30:14 millert Exp $ */
++
+ /*
+- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
+- * rights reserved.
+- *
+- * License to copy and use this software is granted provided that it
+- * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
+- * Algorithm" in all material mentioning or referencing this software
+- * or this function.
+- *
+- * License is also granted to make and use derivative works provided
+- * that such works are identified as "derived from the RSA Data
+- * Security, Inc. MD5 Message-Digest Algorithm" in all material
+- * mentioning or referencing the derived work.
+- *
+- * RSA Data Security, Inc. makes no representations concerning either
+- * the merchantability of this software or the suitability of this
+- * software for any particular purpose. It is provided "as is"
+- * without express or implied warranty of any kind.
+- *
+- * These notices must be retained in any copies of any part of this
+- * documentation and/or software.
++ * This code implements the MD5 message-digest algorithm.
++ * The algorithm is due to Ron Rivest. This code was
++ * written by Colin Plumb in 1993, no copyright is claimed.
++ * This code is in the public domain; do with it what you wish.
++ *
++ * Equivalent code is available from RSA Data Security, Inc.
++ * This code has been tested against that, and is equivalent,
++ * except that you don't need to include two pages of legalese
++ * with every copy.
+ */
+
+-/*!
+- * \file
+- * \brief SIP-router core :: md5 hash support
+- * \ingroup core
+- * Module: \ref core
+- */
++#ifndef _MD5_H_
++#define _MD5_H_
+
+-#ifndef MD5_H
+-#define MD5_H
++#define MD5_BLOCK_LENGTH 64
++#define MD5_DIGEST_LENGTH 16
++#define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1)
+
+-/**
+- * \brief MD5 context
+- */
+-typedef struct {
+- unsigned int state[4]; /* state (ABCD) */
+- unsigned int count[2]; /* number of bits, modulo 2^64 (lsb first) */
+- unsigned char buffer[64]; /* input buffer */
++typedef struct MD5Context {
++ u_int32_t state[4]; /* state */
++ u_int64_t count; /* number of bits, mod 2^64 */
++ u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */
+ } MD5_CTX;
+
+-/**
+- * \brief MD5 context initialization
+- *
+- * MD5 context initialization. Begins an MD5 operation, writing a new context.
+- * \param context initialized context
+- */
+-void MD5Init (MD5_CTX *context);
+-
+-/**
+- * \brief MD5 block update operation
+- *
+- * MD5 block update operation. Continues an MD5 message-digest
+- * operation, processing another message block, and updating the
+- * context.
+- * \param context context
+- * \param input input block
+- * \param inputLen length of input block
+- */
+-void U_MD5Update (MD5_CTX *context, unsigned char *input, unsigned int inputLen);
+-
+- /**
+- * \brief MD5 finalization
+- *
+- * MD5 finalization. Ends an MD5 message-digest operation, writing the
+- * the message digest and zeroizing the context.
+- * \param digest message digest
+- * \param context context
+- */
+-void U_MD5Final (unsigned char digest[16], MD5_CTX *context);
+-
+-/*!
+- * \brief Small wrapper around MD5Update
+- *
+- * Small wrapper around MD5Update, because everybody uses this on 'str' types
+- * \param context MD5 context
+- * \param input input block
+- * \param inputLen length of input block
+- * \note please not use this in new code
+- * \todo review and fix all wrong usage
+- */
+-static inline void MD5Update (MD5_CTX *context, char *input, unsigned int inputLen)
+-{
+- return U_MD5Update(context, (unsigned char *)input, inputLen);
+-}
+-
+-/*!
+- * \brief Small wrapper around MD5Final
+- *
+- * Small wrapper around MD5Final, because everybody uses this on 'str' types
+- * \param digest message digest
+- * \param context MD5 context
+- * \note please not use this in new code
+- * \todo review and fix all wrong usage
+- */
+-static inline void MD5Final (char digest[16], MD5_CTX *context)
+-{
+- U_MD5Final((unsigned char *)digest, context);
+-}
++void MD5Init(MD5_CTX *);
++void MD5Update(MD5_CTX *, const u_int8_t *, size_t);
++void MD5Pad(MD5_CTX *);
++void MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *);
++void MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]);
+
+-#endif /* MD5_H */
++#endif /* _MD5_H_ */
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0032-core-added-md5-wrapper-functions-to-build-with-Colin.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0032-core-added-md5-wrapper-functions-to-build-with-Colin.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0032-core-added-md5-wrapper-functions-to-build-with-Colin.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0032-core-added-md5-wrapper-functions-to-build-with-Colin.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,94 @@
+From d7452228134c42522ef84c1dbdcdc2cfd0bbf331 Mon Sep 17 00:00:00 2001
+From: Daniel-Constantin Mierla <miconda at gmail.com>
+Date: Thu, 2 Aug 2012 10:16:31 +0200
+Subject: [PATCH] core: added md5 wrapper functions to build with Colin
+ Plumb's md5 code
+
+Author: Tzafrir Cohen <tzafrir at debian.org>
+(cherry picked from commit bcff862df5b937e3a6ff87e4415e0039fd989908)
+---
+ md5.c | 11 ++++-------
+ md5.h | 19 +++++++++++++++----
+ 2 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/md5.c b/md5.c
+index 3da18c9..a0a036a 100644
+--- a/md5.c
++++ b/md5.c
+@@ -17,9 +17,6 @@
+ * will fill a supplied 16-byte array with the digest.
+ */
+
+-#include <config.h>
+-#include <compat.h>
+-
+ #include <sys/types.h>
+ #include <string.h>
+
+@@ -66,7 +63,7 @@ MD5Init(MD5_CTX *ctx)
+ * of bytes.
+ */
+ void
+-MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len)
++U_MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len)
+ {
+ size_t have, need;
+
+@@ -117,15 +114,15 @@ MD5Pad(MD5_CTX *ctx)
+ ((ctx->count >> 3) & (MD5_BLOCK_LENGTH - 1));
+ if (padlen < 1 + 8)
+ padlen += MD5_BLOCK_LENGTH;
+- MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */
+- MD5Update(ctx, count, 8);
++ U_MD5Update(ctx, PADDING, padlen - 8); /* padlen - 8 <= 64 */
++ U_MD5Update(ctx, count, 8);
+ }
+
+ /*
+ * Final wrapup--call MD5Pad, fill in digest and zero out ctx.
+ */
+ void
+-MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx)
++U_MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx)
+ {
+ int i;
+
+diff --git a/md5.h b/md5.h
+index f624360..211a131 100644
+--- a/md5.h
++++ b/md5.h
+@@ -19,16 +19,27 @@
+ #define MD5_DIGEST_LENGTH 16
+ #define MD5_DIGEST_STRING_LENGTH (MD5_DIGEST_LENGTH * 2 + 1)
+
++/* Probably not the proper place, but will do for Debian: */
++#include <sys/types.h>
++
+ typedef struct MD5Context {
+ u_int32_t state[4]; /* state */
+ u_int64_t count; /* number of bits, mod 2^64 */
+- u_int8_t buffer[MD5_BLOCK_LENGTH]; /* input buffer */
++ unsigned char buffer[MD5_BLOCK_LENGTH]; /* input buffer */
+ } MD5_CTX;
+
+ void MD5Init(MD5_CTX *);
+-void MD5Update(MD5_CTX *, const u_int8_t *, size_t);
++void U_MD5Update(MD5_CTX *, const unsigned char *, size_t);
+ void MD5Pad(MD5_CTX *);
+-void MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *);
+-void MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]);
++void U_MD5Final(unsigned char [MD5_DIGEST_LENGTH], MD5_CTX *);
++void MD5Transform(u_int32_t [4], const unsigned char [MD5_BLOCK_LENGTH]);
++
++static inline void MD5Update(MD5_CTX *ctx, const char *str, size_t len) {
++ U_MD5Update(ctx, (const unsigned char *)str, len);
++}
++
++static inline void MD5Final(char buf[MD5_DIGEST_LENGTH], MD5_CTX *ctx) {
++ U_MD5Final((unsigned char *)buf, ctx);
++}
+
+ #endif /* _MD5_H_ */
+--
+1.7.9.5
+
Added: kamailio/trunk/debian/patches/upstream/0033-b-f-In-case-of-IPv6-Option-in-the-RTP-Command-the-po.patch
URL: http://svn.debian.org/wsvn/pkg-voip/kamailio/trunk/debian/patches/upstream/0033-b-f-In-case-of-IPv6-Option-in-the-RTP-Command-the-po.patch?rev=9946&op=file
==============================================================================
--- kamailio/trunk/debian/patches/upstream/0033-b-f-In-case-of-IPv6-Option-in-the-RTP-Command-the-po.patch (added)
+++ kamailio/trunk/debian/patches/upstream/0033-b-f-In-case-of-IPv6-Option-in-the-RTP-Command-the-po.patch Tue Sep 4 06:48:22 2012
@@ -1,0 +1,27 @@
+From f5997ba82e066d667d8fdf48a0eb8f284abe70be Mon Sep 17 00:00:00 2001
+From: Carsten Bock <carsten at ng-voice.com>
+Date: Mon, 3 Sep 2012 21:31:58 +0200
+Subject: [PATCH] b/f: In case of IPv6 Option in the RTP-Command, the pointers
+ and the length need to be updated.
+
+---
+ modules/rtpproxy/rtpproxy.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c
+index eee5ce0..0453ef9 100644
+--- a/modules/rtpproxy/rtpproxy.c
++++ b/modules/rtpproxy/rtpproxy.c
+@@ -2203,6 +2203,9 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer, int forc
+ LM_ERR("out of pkg memory\n");
+ FORCE_RTP_PROXY_RET (-1);
+ }
++ /* We need to update the pointers and the length here, it has changed. */
++ v[1].iov_base = opts.s.s;
++ v[1].iov_len = opts.oidx;
+ }
+ STR2IOVEC(newip, v[9]);
+ STR2IOVEC(oldport, v[11]);
+--
+1.7.9.5
+
More information about the Pkg-voip-commits
mailing list