commit libeXosip2

28 Feb 2008

Hello community,

here is the log from the commit of package libeXosip2
checked in at Thu Feb 28 12:26:18 CET 2008.

--------

--- libeXosip2/libeXosip2.changes	2008-01-10 09:07:56.000000000 +0100
+++ /mounts/work_users/ro/STABLE/libeXosip2/libeXosip2.changes	2008-02-28 12:25:00.351121000 +0100
@@ -1,0 +2,5 @@
+Thu Feb 28 12:24:46 CET 2008 - ro@suse.de
+
+- fix build with current libosip2 (MD5... -> osip_MD5...) 
+
+-------------------------------------------------------------------

New:
----
  libeXosip2-md5ctx.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libeXosip2.spec ++++++
--- /var/tmp/diff_new_pack.Y27648/_old	2008-02-28 12:26:07.000000000 +0100
+++ /var/tmp/diff_new_pack.Y27648/_new	2008-02-28 12:26:07.000000000 +0100
@@ -10,16 +10,18 @@
 
 # norootforbuild
 
+
 Name:           libeXosip2
 BuildRequires:  glibc-devel libopenssl-devel libosip2-devel
-License:        GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+License:        GPL v2 only
 Group:          Productivity/Networking/Other
 Summary:        extended osip2 library
 Version:        3.0.3
-Release:        2
+Release:        14
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://savannah.nongnu.org/forum/forum.php?forum_id=3778
 Source:         libeXosip2-%{version}.tar.bz2
+Patch:          libeXosip2-md5ctx.patch
 
 %description
 extended library for the osip2 protocoll.
@@ -64,6 +66,7 @@
 
 %prep
 %setup -q -n libeXosip2-%{version}
+%patch
 
 %build
 #./autogen.sh
@@ -97,8 +100,10 @@
 #%_libdir/pkgconfig/libeXosip2.pc
 
 %changelog
-* Thu Jan 10 2008 - mskibbe@suse.de
+* Thu Feb 28 2008 ro@suse.de
+- fix build with current libosip2 (MD5... -> osip_MD5...)
+* Thu Jan 10 2008 mskibbe@suse.de
 - use --disable-static
 - detaillize files section
-* Tue Dec 18 2007 - mskibbe@suse.de
+* Tue Dec 18 2007 mskibbe@suse.de
 - create package

++++++ libeXosip2-md5ctx.patch ++++++
--- src/jauth.c
+++ src/jauth.c
@@ -90,25 +90,25 @@
                IN const char *pszNonce,
                IN const char *pszCNonce, OUT HASHHEX SessionKey)
 {
-  MD5_CTX Md5Ctx;
+  osip_MD5_CTX Md5Ctx;
   HASH HA1;
 
-  MD5Init (&Md5Ctx);
-  MD5Update (&Md5Ctx, (unsigned char *) pszUserName, strlen (pszUserName));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszRealm, strlen (pszRealm));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszPassword, strlen (pszPassword));
-  MD5Final ((unsigned char *) HA1, &Md5Ctx);
+  osip_MD5Init (&Md5Ctx);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszUserName, strlen (pszUserName));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszRealm, strlen (pszRealm));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszPassword, strlen (pszPassword));
+  osip_MD5Final ((unsigned char *) HA1, &Md5Ctx);
   if ((pszAlg != NULL) && osip_strcasecmp (pszAlg, "md5-sess") == 0)
     {
-      MD5Init (&Md5Ctx);
-      MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHLEN);
-      MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-      MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce));
-      MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-      MD5Update (&Md5Ctx, (unsigned char *) pszCNonce, strlen (pszCNonce));
-      MD5Final ((unsigned char *) HA1, &Md5Ctx);
+      osip_MD5Init (&Md5Ctx);
+      osip_MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHLEN);
+      osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+      osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce));
+      osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+      osip_MD5Update (&Md5Ctx, (unsigned char *) pszCNonce, strlen (pszCNonce));
+      osip_MD5Final ((unsigned char *) HA1, &Md5Ctx);
     }
   CvtHex (HA1, SessionKey);
 }
@@ -126,16 +126,16 @@
                     OUT HASHHEX Response
                     /* request-digest or response-digest */ )
 {
-  MD5_CTX Md5Ctx;
+  osip_MD5_CTX Md5Ctx;
   HASH HA2;
   HASH RespHash;
   HASHHEX HA2Hex;
 
   /* calculate H(A2) */
-  MD5Init (&Md5Ctx);
-  MD5Update (&Md5Ctx, (unsigned char *) pszMethod, strlen (pszMethod));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszDigestUri, strlen (pszDigestUri));
+  osip_MD5Init (&Md5Ctx);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszMethod, strlen (pszMethod));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszDigestUri, strlen (pszDigestUri));
 
   if (pszQop == NULL)
     {
@@ -151,43 +151,43 @@
     }
 
 auth_withoutqop:
-  MD5Final ((unsigned char *) HA2, &Md5Ctx);
+  osip_MD5Final ((unsigned char *) HA2, &Md5Ctx);
   CvtHex (HA2, HA2Hex);
 
   /* calculate response */
-  MD5Init (&Md5Ctx);
-  MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN);
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Init (&Md5Ctx);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
 
   goto end;
 
 auth_withauth_int:
 
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) HEntity, HASHHEXLEN);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) HEntity, HASHHEXLEN);
 
 auth_withauth:
-  MD5Final ((unsigned char *) HA2, &Md5Ctx);
+  osip_MD5Final ((unsigned char *) HA2, &Md5Ctx);
   CvtHex (HA2, HA2Hex);
 
   /* calculate response */
-  MD5Init (&Md5Ctx);
-  MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN);
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszNonceCount, strlen (pszNonceCount));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszCNonce, strlen (pszCNonce));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-  MD5Update (&Md5Ctx, (unsigned char *) pszQop, strlen (pszQop));
-  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Init (&Md5Ctx);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) HA1, HASHHEXLEN);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonce, strlen (pszNonce));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszNonceCount, strlen (pszNonceCount));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszCNonce, strlen (pszCNonce));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) pszQop, strlen (pszQop));
+  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
 
 end:
-  MD5Update (&Md5Ctx, (unsigned char *) HA2Hex, HASHHEXLEN);
-  MD5Final ((unsigned char *) RespHash, &Md5Ctx);
+  osip_MD5Update (&Md5Ctx, (unsigned char *) HA2Hex, HASHHEXLEN);
+  osip_MD5Final ((unsigned char *) RespHash, &Md5Ctx);
   CvtHex (RespHash, Response);
 }
 
--- src/jreg.c
+++ src/jreg.c
@@ -58,15 +58,15 @@
   (*jr)->r_registrar = osip_strdup (proxy);     /* registrar */
 
   {
-	  MD5_CTX Md5Ctx;
+	  osip_MD5_CTX Md5Ctx;
 	  HASH hval;
 	  HASHHEX key_line;
 
-	  MD5Init (&Md5Ctx);
-	  MD5Update (&Md5Ctx, (unsigned char *) from, strlen (from));
-	  MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
-	  MD5Update (&Md5Ctx, (unsigned char *) proxy, strlen (proxy));
-	  MD5Final ((unsigned char *) hval, &Md5Ctx);
+	  osip_MD5Init (&Md5Ctx);
+	  osip_MD5Update (&Md5Ctx, (unsigned char *) from, strlen (from));
+	  osip_MD5Update (&Md5Ctx, (unsigned char *) ":", 1);
+	  osip_MD5Update (&Md5Ctx, (unsigned char *) proxy, strlen (proxy));
+	  osip_MD5Final ((unsigned char *) hval, &Md5Ctx);
 	  CvtHex (hval, key_line);
 
 	  osip_strncpy((*jr)->r_line, key_line,

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit libeXosip2

root＠Hilbert.suse.de