diff options
author | Damien Miller <djm@mindrot.org> | 2006-03-31 23:13:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-03-31 23:13:02 +1100 |
commit | 3f9418893e1254bda3b87e7d3af7029d11b0a6c7 (patch) | |
tree | 97662277f300ea1ab8255905b9d5d72a26f7578f /gss-serv.c | |
parent | d79b424e8ad424a44119f327e5ab1f79cd35649c (diff) |
- djm@cvs.openbsd.org 2006/03/30 09:58:16
[authfd.c bufaux.c deattack.c gss-serv.c mac.c misc.c misc.h]
[monitor_wrap.c msg.c packet.c sftp-client.c sftp-server.c ssh-agent.c]
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 'gss-serv.c')
-rw-r--r-- | gss-serv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gss-serv.c b/gss-serv.c index 53ec634e8..5e43ffe58 100644 --- a/gss-serv.c +++ b/gss-serv.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: gss-serv.c,v 1.16 2006/03/25 22:22:43 djm Exp $ */ | 1 | /* $OpenBSD: gss-serv.c,v 1.17 2006/03/30 09:58:15 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -35,7 +35,7 @@ | |||
35 | #include "session.h" | 35 | #include "session.h" |
36 | #include "servconf.h" | 36 | #include "servconf.h" |
37 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
38 | #include "getput.h" | 38 | #include "misc.h" |
39 | 39 | ||
40 | #include "ssh-gss.h" | 40 | #include "ssh-gss.h" |
41 | 41 | ||
@@ -153,7 +153,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name) | |||
153 | * second without. | 153 | * second without. |
154 | */ | 154 | */ |
155 | 155 | ||
156 | oidl = GET_16BIT(tok+2); /* length including next two bytes */ | 156 | oidl = get_u16(tok+2); /* length including next two bytes */ |
157 | oidl = oidl-2; /* turn it into the _real_ length of the variable OID */ | 157 | oidl = oidl-2; /* turn it into the _real_ length of the variable OID */ |
158 | 158 | ||
159 | /* | 159 | /* |
@@ -170,7 +170,7 @@ ssh_gssapi_parse_ename(Gssctxt *ctx, gss_buffer_t ename, gss_buffer_t name) | |||
170 | if (ename->length < offset+4) | 170 | if (ename->length < offset+4) |
171 | return GSS_S_FAILURE; | 171 | return GSS_S_FAILURE; |
172 | 172 | ||
173 | name->length = GET_32BIT(tok+offset); | 173 | name->length = get_u32(tok+offset); |
174 | offset += 4; | 174 | offset += 4; |
175 | 175 | ||
176 | if (ename->length < offset+name->length) | 176 | if (ename->length < offset+name->length) |