- Merged OpenBSD CVS changes:

[openssh.git] / bufaux.c

diff --git a/bufaux.c b/bufaux.c
index 56e0346487cea6bb69aeadc6050b958e58cfdee6..1981fddd96acddd808604520e0958a067088642c 100644 (file)
--- a/bufaux.c
+++ b/bufaux.c
@@ -14,11 +14,19 @@ Buffers.
 
 */
 
+#include "config.h"
 #include "includes.h"
 RCSID("$Id$");
 
 #include "ssh.h"
+
+#ifdef HAVE_OPENSSL
 #include <openssl/bn.h>
+#endif
+#ifdef HAVE_SSL
+#include <ssl/bn.h>
+#endif
+
 #include "bufaux.h"
 #include "xmalloc.h"
 #include "getput.h"
@@ -37,7 +45,9 @@ buffer_put_bignum(Buffer *buffer, BIGNUM *value)
   
   /* Get the value of in binary */
   oi = BN_bn2bin(value, buf);
-  assert(oi == bin_size);
+  if (oi != bin_size)
+    fatal("buffer_put_bignum: BN_bn2bin() failed: oi %d != bin_size %d",
+         oi, bin_size);
 
   /* Store the number of bits in the buffer in two bytes, msb first. */
   PUT_16BIT(msg, bits);