summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/gss-serv.c
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2006-03-30 09:58:17 +0000
committerDamien Miller <djm@cvs.openbsd.org>2006-03-30 09:58:17 +0000
commit7eb9710e84a54498a77871f47feb8df3e857c43c (patch)
tree7fdb983bc5d18e1924e9c84823fb5d2d57a0a008 /usr.bin/ssh/gss-serv.c
parentede133f9b618e890fb221bced62edde9a7dab4cb (diff)
replace {GET,PUT}_XXBIT macros with functionally similar functions,
silencing a heap of lint warnings. also allows them to use __bounded__ checking which can't be applied to macros; requested by and feedback from deraadt@
Diffstat (limited to 'usr.bin/ssh/gss-serv.c')
-rw-r--r--usr.bin/ssh/gss-serv.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/gss-serv.c b/usr.bin/ssh/gss-serv.c
index 53ec634e866..5e43ffe5897 100644
--- a/usr.bin/ssh/gss-serv.c
+++ b/usr.bin/ssh/gss-serv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gss-serv.c,v 1.16 2006/03/25 22:22:43 djm Exp $ */
+/* $OpenBSD: gss-serv.c,v 1.17 2006/03/30 09:58:15 djm Exp $ */
/*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@@ -35,7 +35,7 @@
#include "session.h"
#include "servconf.h"
#include "xmalloc.h"
-#include "getput.h"
+#include "misc.h"
#include "ssh-gss.h"
@@ -153,7 +153,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
* second without.
*/
- oidl = GET_16BIT(tok+2); /* length including next two bytes */
+ oidl = get_u16(tok+2); /* length including next two bytes */
oidl = oidl-2; /* turn it into the _real_ length of the variable OID */
/*
@@ -170,7 +170,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name)
if (ename->length < offset+4)
return GSS_S_FAILURE;
- name->length = GET_32BIT(tok+offset);
+ name->length = get_u32(tok+offset);
offset += 4;
if (ename->length < offset+name->length)