diff options
| author | David Shaw <[email protected]> | 2006-01-26 16:51:04 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2006-01-26 16:51:04 +0000 |
| commit | 23cfe019e99f54a229b0eeb68d4afb1a788b2886 (patch) | |
| tree | ac8a2fd6e5ce06c805efda4fd249d2d25ba13507 | |
| parent | * keyserver.c (parse_keyserver_uri): If there is a path present, set the (diff) | |
| download | gnupg-23cfe019e99f54a229b0eeb68d4afb1a788b2886.tar.gz gnupg-23cfe019e99f54a229b0eeb68d4afb1a788b2886.zip | |
* 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.
| -rw-r--r-- | util/ChangeLog | 7 | ||||
| -rw-r--r-- | util/cert.c | 2 | ||||
| -rw-r--r-- | util/srv.c | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 9b596cebe..624dbaedc 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,10 @@ +2006-01-26 David Shaw <[email protected]> + + * 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 <[email protected]> * cert.c (get_cert): Properly chase down CNAMEs pointing to CERTs. diff --git a/util/cert.c b/util/cert.c index 11a30161e..e37544e01 100644 --- a/util/cert.c +++ b/util/cert.c @@ -134,6 +134,7 @@ get_cert(const char *name,size_t max_size,IOBUF *iobuf,char **url) 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 @@ get_cert(const char *name,size_t max_size,IOBUF *iobuf,char **url) ret=2; break; } +#endif /* Neither type matches, so go around to the next answer. */ pt+=dlen; diff --git a/util/srv.c b/util/srv.c index 21f1d9ade..95187dbc8 100644 --- a/util/srv.c +++ b/util/srv.c @@ -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 @@ getsrv(const char *name,struct srventry **list) *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 && |