From 62f0afa2ecead02b1258dabab8097ca278a22f8f Mon Sep 17 00:00:00 2001
From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Date: Wed, 21 Sep 2016 20:29:42 -0400
Subject: Import upstream version 0.9+1474479173.6c180c6

---
 Cryptlib/OpenSSL/crypto/des/des_old.c  | 2 +-
 Cryptlib/OpenSSL/crypto/des/des_old2.c | 2 +-
 Cryptlib/OpenSSL/crypto/des/read2pwd.c | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'Cryptlib/OpenSSL/crypto/des')

diff --git a/Cryptlib/OpenSSL/crypto/des/des_old.c b/Cryptlib/OpenSSL/crypto/des/des_old.c
index 54b0968e..c5c5a00f 100644
--- a/Cryptlib/OpenSSL/crypto/des/des_old.c
+++ b/Cryptlib/OpenSSL/crypto/des/des_old.c
@@ -1,4 +1,4 @@
-/* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */
+/* crypto/des/des_old.c */
 
 /*-
  * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
diff --git a/Cryptlib/OpenSSL/crypto/des/des_old2.c b/Cryptlib/OpenSSL/crypto/des/des_old2.c
index f7d28a67..247ff8dc 100644
--- a/Cryptlib/OpenSSL/crypto/des/des_old2.c
+++ b/Cryptlib/OpenSSL/crypto/des/des_old2.c
@@ -1,4 +1,4 @@
-/* crypto/des/des_old.c -*- mode:C; c-file-style: "eay" -*- */
+/* crypto/des/des_old.c */
 
 /*
  * WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING The
diff --git a/Cryptlib/OpenSSL/crypto/des/read2pwd.c b/Cryptlib/OpenSSL/crypto/des/read2pwd.c
index 01e275f3..76331396 100644
--- a/Cryptlib/OpenSSL/crypto/des/read2pwd.c
+++ b/Cryptlib/OpenSSL/crypto/des/read2pwd.c
@@ -114,6 +114,10 @@
 #include <openssl/ui.h>
 #include <openssl/crypto.h>
 
+#ifndef BUFSIZ
+#define BUFSIZ 256
+#endif
+
 int DES_read_password(DES_cblock *key, const char *prompt, int verify)
 {
     int ok;
-- 
cgit v1.2.3