import openssh-5.1p1-gsskex-cjwatson-20080722.patch

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 @@
-/*      $OpenBSD: base64.c,v 1.4 2002/01/02 23:00:10 deraadt Exp $      */
+/*      $OpenBSD: base64.c,v 1.5 2006/10/21 09:55:03 otto Exp $ */
 
 /*
  * Copyright (c) 1996 by Internet Software Consortium.
@@ -62,9 +62,6 @@
 
 #include "base64.h"
 
-/* XXX abort illegal in library */
-#define Assert(Cond) if (!(Cond)) abort()
-
 static const char Base64[] =
         "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 static const char Pad64 = '=';
@@ -151,10 +148,6 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
                 output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
                 output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
                 output[3] = input[2] & 0x3f;
-                Assert(output[0] < 64);
-                Assert(output[1] < 64);
-                Assert(output[2] < 64);
-                Assert(output[3] < 64);
 
                 if (datalength + 4 > targsize)
                         return (-1);
@@ -174,9 +167,6 @@ b64_ntop(u_char const *src, size_t srclength, char *target, size_t targsize)
                 output[0] = input[0] >> 2;
                 output[1] = ((input[0] & 0x03) << 4) + (input[1] >> 4);
                 output[2] = ((input[1] & 0x0f) << 2) + (input[2] >> 6);
-                Assert(output[0] < 64);
-                Assert(output[1] < 64);
-                Assert(output[2] < 64);
 
                 if (datalength + 4 > targsize)
                         return (-1);