diff options
author | Damien Miller <djm@mindrot.org> | 2007-10-26 16:17:24 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2007-10-26 16:17:24 +1000 |
commit | 1651f6c40eaba61a6a2f30b79c57348e6906070f (patch) | |
tree | eb9b34baa7990bea75282b96583c20089f615f5b /openbsd-compat/base64.c | |
parent | a97529fa2ead2e6fa88de3cc599832cf1e3bc4eb (diff) |
- otto@cvs.openbsd.org 2006/10/21 09:55:03
[openbsd-compat/base64.c]
remove calls to abort(3) that can't happen anyway; from
<bret dot lambert at gmail.com>; ok millert@ deraadt@
Diffstat (limited to 'openbsd-compat/base64.c')
-rw-r--r-- | openbsd-compat/base64.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/openbsd-compat/base64.c b/openbsd-compat/base64.c index 9a60f583b..9e7466716 100644 --- a/openbsd-compat/base64.c +++ b/openbsd-compat/base64.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $ */ | 1 | /* $OpenBSD: base64.c,v 1.5 2006/10/21 09:55:03 otto Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1996 by Internet Software Consortium. | 4 | * Copyright (c) 1996 by Internet Software Consortium. |
@@ -62,9 +62,6 @@ | |||
62 | 62 | ||
63 | #include "base64.h" | 63 | #include "base64.h" |
64 | 64 | ||
65 | /* XXX abort illegal in library */ | ||
66 | #define Assert(Cond) if (!(Cond)) abort() | ||
67 | |||
68 | static const char Base64[] = | 65 | static const char Base64[] = |
69 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; | 66 | "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; |
70 | static const char Pad64 = '='; | 67 | static const char Pad64 = '='; |
@@ -151,10 +148,6 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) | |||
151 | output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); | 148 | output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); |
152 | output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); | 149 | output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); |
153 | output[3] = input[2] & 0x3f; | 150 | output[3] = input[2] & 0x3f; |
154 | Assert(output[0] < 64); | ||
155 | Assert(output[1] < 64); | ||
156 | Assert(output[2] < 64); | ||
157 | Assert(output[3] < 64); | ||
158 | 151 | ||
159 | if (datalength + 4 > targsize) | 152 | if (datalength + 4 > targsize) |
160 | return (-1); | 153 | return (-1); |
@@ -174,9 +167,6 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize) | |||
174 | output[0] = input[0] >> 2; | 167 | output[0] = input[0] >> 2; |
175 | output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); | 168 | output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4); |
176 | output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); | 169 | output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6); |
177 | Assert(output[0] < 64); | ||
178 | Assert(output[1] < 64); | ||
179 | Assert(output[2] < 64); | ||
180 | 170 | ||
181 | if (datalength + 4 > targsize) | 171 | if (datalength + 4 > targsize) |
182 | return (-1); | 172 | return (-1); |