Commit e2b82b43 authored by Michal Marek's avatar Michal Marek
Browse files

- Make Curl_write and it's callees accept a const pointer, in preparation 

  of tetetest's patch for curl_easy_send()
parent cf4570a0

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ 
                                  Changelog





Michal Marek (9 May 2008)

- Make Curl_write and it's callees accept a const pointer, in preparation

  of tetetest's patch for curl_easy_send()



Daniel Stenberg (7 May 2008)

- Liam Healy filed the debian bug report #480044

  (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=480044) identifying a

lib/krb4.c

+6 −3
Original line number Diff line number Diff line
@@ -151,17 +151,20 @@ krb4_overhead(void *app_data, int level, int len) 
}



static int

krb4_encode(void *app_data, void *from, int length, int level, void **to,

krb4_encode(void *app_data, const void *from, int length, int level, void **to,

            struct connectdata *conn)

{

  struct krb4_data *d = app_data;

  *to = malloc(length + 31);

  if(level == prot_safe)

    return krb_mk_safe(from, *to, length, &d->key,

    /* NOTE that the void* cast is safe, krb_mk_safe/priv don't modify the

     * input buffer

     */

    return krb_mk_safe((void*)from, *to, length, &d->key,

                       (struct sockaddr_in *)LOCAL_ADDR,

                       (struct sockaddr_in *)REMOTE_ADDR);

  else if(level == prot_private)

    return krb_mk_priv(from, *to, length, d->schedule, &d->key,

    return krb_mk_priv((void*)from, *to, length, d->schedule, &d->key,

                       (struct sockaddr_in *)LOCAL_ADDR,

                       (struct sockaddr_in *)REMOTE_ADDR);

  else

lib/krb4.h

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct Curl_sec_client_mech { 
  void (*end)(void *);

  int (*check_prot)(void *, int);

  int (*overhead)(void *, int, int);

  int (*encode)(void *, void*, int, int, void**, struct connectdata *);

  int (*encode)(void *, const void*, int, int, void**, struct connectdata *);

  int (*decode)(void *, void*, int, int, struct connectdata *);

};
@@ -58,8 +58,8 @@ int Curl_sec_read_msg (struct connectdata *conn, char *, int); 
int Curl_sec_vfprintf(struct connectdata *, FILE *, const char *, va_list);

int Curl_sec_fprintf2(struct connectdata *conn, FILE *f, const char *fmt, ...);

int Curl_sec_vfprintf2(struct connectdata *conn, FILE *, const char *, va_list);

ssize_t Curl_sec_send(struct connectdata *conn, int, char *, int);

int Curl_sec_write(struct connectdata *conn, int, char *, int);

ssize_t Curl_sec_send(struct connectdata *conn, int, const char *, int);

int Curl_sec_write(struct connectdata *conn, int, const char *, int);



void Curl_sec_end (struct connectdata *);

int Curl_sec_login (struct connectdata *);

lib/krb5.c

+5 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ krb5_overhead(void *app_data, int level, int len) 
}



static int

krb5_encode(void *app_data, void *from, int length, int level, void **to,

krb5_encode(void *app_data, const void *from, int length, int level, void **to,

            struct connectdata *conn)

{

  gss_ctx_id_t *context = app_data;
@@ -128,7 +128,10 @@ krb5_encode(void *app_data, void *from, int length, int level, void **to, 
  /* shut gcc up */

  conn = NULL;



  dec.value = from;

  /* NOTE that the cast is safe, neither of the krb5, gnu gss and heimdal 

   * libraries modify the input buffer in gss_seal()

   */

  dec.value = (void*)from;

  dec.length = length;

  maj = gss_seal(&min, *context,

		 level == prot_private,

lib/security.c

+3 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ Curl_sec_read(struct connectdata *conn, int fd, void *buffer, int length) 
}



static int

sec_send(struct connectdata *conn, int fd, char *from, int length)

sec_send(struct connectdata *conn, int fd, const char *from, int length)

{

  int bytes;

  void *buf;
@@ -292,7 +292,7 @@ Curl_sec_fflush_fd(struct connectdata *conn, int fd) 
}



int

Curl_sec_write(struct connectdata *conn, int fd, char *buffer, int length)

Curl_sec_write(struct connectdata *conn, int fd, const char *buffer, int length)

{

  int len = conn->buffer_size;

  int tx = 0;
@@ -315,7 +315,7 @@ Curl_sec_write(struct connectdata *conn, int fd, char *buffer, int length) 
}



ssize_t

Curl_sec_send(struct connectdata *conn, int num, char *buffer, int length)

Curl_sec_send(struct connectdata *conn, int num, const char *buffer, int length)

{

  curl_socket_t fd = conn->sock[num];

  return (ssize_t)Curl_sec_write(conn, fd, buffer, length);