===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ldap/Attic/ber.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/ldap/Attic/ber.c	2018/07/13 08:50:38	1.14
--- src/usr.bin/ldap/Attic/ber.c	2018/07/31 11:02:01	1.15
***************
*** 1,4 ****
! /*	$OpenBSD: ber.c,v 1.14 2018/07/13 08:50:38 rob Exp $ */
  
  /*
   * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: ber.c,v 1.15 2018/07/31 11:02:01 claudio Exp $ */
  
  /*
   * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org>
***************
*** 42,48 ****
  static void	ber_dump_header(struct ber *ber, struct ber_element *root);
  static void	ber_putc(struct ber *ber, u_char c);
  static void	ber_write(struct ber *ber, void *buf, size_t len);
! static ssize_t	get_id(struct ber *b, unsigned long *tag, int *class,
      int *cstruct);
  static ssize_t	get_len(struct ber *b, ssize_t *len);
  static ssize_t	ber_read_element(struct ber *ber, struct ber_element *elm);
--- 42,48 ----
  static void	ber_dump_header(struct ber *ber, struct ber_element *root);
  static void	ber_putc(struct ber *ber, u_char c);
  static void	ber_write(struct ber *ber, void *buf, size_t len);
! static ssize_t	get_id(struct ber *b, unsigned int *tag, int *class,
      int *cstruct);
  static ssize_t	get_len(struct ber *b, ssize_t *len);
  static ssize_t	ber_read_element(struct ber *ber, struct ber_element *elm);
***************
*** 56,62 ****
  #endif
  
  struct ber_element *
! ber_get_element(unsigned long encoding)
  {
  	struct ber_element *elm;
  
--- 56,62 ----
  #endif
  
  struct ber_element *
! ber_get_element(unsigned int encoding)
  {
  	struct ber_element *elm;
  
***************
*** 70,76 ****
  }
  
  void
! ber_set_header(struct ber_element *elm, int class, unsigned long type)
  {
  	elm->be_class = class & BER_CLASS_MASK;
  	if (type == BER_TYPE_DEFAULT)
--- 70,76 ----
  }
  
  void
! ber_set_header(struct ber_element *elm, int class, unsigned int type)
  {
  	elm->be_class = class & BER_CLASS_MASK;
  	if (type == BER_TYPE_DEFAULT)
***************
*** 521,527 ****
  	va_list			 ap;
  	int			 d, class;
  	size_t			 len;
! 	unsigned long		 type;
  	long long		 i;
  	char			*s;
  	void			*p;
--- 521,527 ----
  	va_list			 ap;
  	int			 d, class;
  	size_t			 len;
! 	unsigned int		 type;
  	long long		 i;
  	char			*s;
  	void			*p;
***************
*** 578,584 ****
  			break;
  		case 't':
  			class = va_arg(ap, int);
! 			type = va_arg(ap, unsigned long);
  			ber_set_header(ber, class, type);
  			break;
  		case 'x':
--- 578,584 ----
  			break;
  		case 't':
  			class = va_arg(ap, int);
! 			type = va_arg(ap, unsigned int);
  			ber_set_header(ber, class, type);
  			break;
  		case 'x':
***************
*** 626,632 ****
  #define _MAX_SEQ		 128
  	va_list			 ap;
  	int			*d, level = -1;
! 	unsigned long		*t;
  	long long		*i, l;
  	void			**ptr;
  	size_t			*len, ret = 0, n = strlen(fmt);
--- 626,632 ----
  #define _MAX_SEQ		 128
  	va_list			 ap;
  	int			*d, level = -1;
! 	unsigned int		*t;
  	long long		*i, l;
  	void			**ptr;
  	size_t			*len, ret = 0, n = strlen(fmt);
***************
*** 694,700 ****
  			break;
  		case 't':
  			d = va_arg(ap, int *);
! 			t = va_arg(ap, unsigned long *);
  			*d = ber->be_class;
  			*t = ber->be_type;
  			ret++;
--- 694,700 ----
  			break;
  		case 't':
  			d = va_arg(ap, int *);
! 			t = va_arg(ap, unsigned int *);
  			*d = ber->be_class;
  			*t = ber->be_type;
  			ret++;
***************
*** 867,873 ****
  size_t
  ber_calc_len(struct ber_element *root)
  {
! 	unsigned long t;
  	size_t s;
  	size_t size = 2;	/* minimum 1 byte head and 1 byte size */
  
--- 867,873 ----
  size_t
  ber_calc_len(struct ber_element *root)
  {
! 	unsigned int t;
  	size_t s;
  	size_t size = 2;	/* minimum 1 byte head and 1 byte size */
  
***************
*** 945,952 ****
  static void
  ber_dump_header(struct ber *ber, struct ber_element *root)
  {
! 	u_char	id = 0, t, buf[8];
! 	unsigned long type;
  	size_t size;
  
  	/* class universal, type encoding depending on type value */
--- 945,952 ----
  static void
  ber_dump_header(struct ber *ber, struct ber_element *root)
  {
! 	u_char	id = 0, t, buf[5];
! 	unsigned int type;
  	size_t size;
  
  	/* class universal, type encoding depending on type value */
***************
*** 1010,1020 ****
   * extract a BER encoded tag. There are two types, a short and long form.
   */
  static ssize_t
! get_id(struct ber *b, unsigned long *tag, int *class, int *cstruct)
  {
  	u_char u;
  	size_t i = 0;
! 	unsigned long t = 0;
  
  	if (ber_getc(b, &u) == -1)
  		return -1;
--- 1010,1020 ----
   * extract a BER encoded tag. There are two types, a short and long form.
   */
  static ssize_t
! get_id(struct ber *b, unsigned int *tag, int *class, int *cstruct)
  {
  	u_char u;
  	size_t i = 0;
! 	unsigned int t = 0;
  
  	if (ber_getc(b, &u) == -1)
  		return -1;
***************
*** 1032,1038 ****
  			return -1;
  		t = (t << 7) | (u & ~BER_TAG_MORE);
  		i++;
! 		if (i > sizeof(unsigned long)) {
  			errno = ERANGE;
  			return -1;
  		}
--- 1032,1038 ----
  			return -1;
  		t = (t << 7) | (u & ~BER_TAG_MORE);
  		i++;
! 		if (i > sizeof(unsigned int)) {
  			errno = ERANGE;
  			return -1;
  		}
***************
*** 1093,1099 ****
  {
  	long long val = 0;
  	struct ber_element *next;
! 	unsigned long type;
  	int i, class, cstruct;
  	ssize_t len, r, totlen = 0;
  	u_char c;
--- 1093,1099 ----
  {
  	long long val = 0;
  	struct ber_element *next;
! 	unsigned int type;
  	int i, class, cstruct;
  	ssize_t len, r, totlen = 0;
  	u_char c;
***************
*** 1221,1227 ****
  }
  
  void
! ber_set_application(struct ber *b, unsigned long (*cb)(struct ber_element *))
  {
  	b->br_application = cb;
  }
--- 1221,1227 ----
  }
  
  void
! ber_set_application(struct ber *b, unsigned int (*cb)(struct ber_element *))
  {
  	b->br_application = cb;
  }