[svn] GnuPG - r3993 - trunk/util

[svn author dshaw]

Author: dshaw
Date: 2006-01-26 17:51:04 +0100 (Thu, 26 Jan 2006)
New Revision: 3993

Modified:
   trunk/util/ChangeLog
   trunk/util/cert.c
   trunk/util/srv.c
Log:
* cert.c (get_cert): Disable IPGP types for now until the format questions
in the draft are settled.

* srv.c (getsrv): Error on oversize SRV responses.


Modified: trunk/util/ChangeLog
===================================================================
--- trunk/util/ChangeLog	2006-01-24 21:03:06 UTC (rev 3992)
+++ trunk/util/ChangeLog	2006-01-26 16:51:04 UTC (rev 3993)
@@ -1,3 +1,10 @@
+2006-01-26  David Shaw  <dshaw at jabberwocky.com>
+
+	* cert.c (get_cert): Disable IPGP types for now until the format
+	questions in the draft are settled.
+
+	* srv.c (getsrv): Error on oversize SRV responses.
+
 2005-12-24  David Shaw  <dshaw at jabberwocky.com>
 
 	* cert.c (get_cert): Properly chase down CNAMEs pointing to CERTs.

Modified: trunk/util/cert.c
===================================================================
--- trunk/util/cert.c	2006-01-24 21:03:06 UTC (rev 3992)
+++ trunk/util/cert.c	2006-01-26 16:51:04 UTC (rev 3993)
@@ -134,6 +134,7 @@
 	      ret=1;
 	      break;
 	    }
+#if 0
 	  else if(ctype==6 && dlen<1023 && url)
 	    {
 	      /* Sanity check the IPGP URL type that the URL isn't too
@@ -145,6 +146,7 @@
 	      ret=2;
 	      break;
 	    }
+#endif
 
 	  /* Neither type matches, so go around to the next answer. */
 	  pt+=dlen;

Modified: trunk/util/srv.c
===================================================================
--- trunk/util/srv.c	2006-01-24 21:03:06 UTC (rev 3992)
+++ trunk/util/srv.c	2006-01-26 16:51:04 UTC (rev 3993)
@@ -42,7 +42,8 @@
 #define T_SRV 33
 #endif
 
-static int priosort(const void *a,const void *b)
+static int
+priosort(const void *a,const void *b)
 {
   const struct srventry *sa=a,*sb=b;
   if(sa->priority>sb->priority)
@@ -64,7 +65,7 @@
   *list=NULL;
 
   r=res_query(name,C_IN,T_SRV,answer,PACKETSZ);
-  if(r<sizeof(HEADER))
+  if(r<sizeof(HEADER) || r>PACKETSZ)
     return -1;
 
   if((((HEADER *)answer)->rcode)==NOERROR &&