summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-04-26 11:08:10 +0000
committerjsing <jsing@openbsd.org>2014-04-26 11:08:10 +0000
commit85d40ae4e0ff1cc8e3f8aafb8f9a0888b1ddad2f (patch)
treef4ea8c4b032e0c05c3fc3f77b56be2df47554f1f /lib
parentLink traceroute6 to traceroute, thus completing the merge. (diff)
downloadwireguard-openbsd-85d40ae4e0ff1cc8e3f8aafb8f9a0888b1ddad2f.tar.xz
wireguard-openbsd-85d40ae4e0ff1cc8e3f8aafb8f9a0888b1ddad2f.zip
Do you really want to build OpenSSL for 16-bit Windows? Well, we don't.
ok miod@
Diffstat (limited to 'lib')
-rw-r--r--lib/libcrypto/txt_db/txt_db.c6
-rw-r--r--lib/libssl/src/crypto/txt_db/txt_db.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/lib/libcrypto/txt_db/txt_db.c b/lib/libcrypto/txt_db/txt_db.c
index 69fd2ba5bf0..a2afa3df234 100644
--- a/lib/libcrypto/txt_db/txt_db.c
+++ b/lib/libcrypto/txt_db/txt_db.c
@@ -157,17 +157,13 @@ TXT_DB_read(BIO *in, int num)
}
*(p++)='\0';
if ((n != num) || (*f != '\0')) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
-#endif
er = 2;
goto err;
}
pp[n] = p;
if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
fprintf(stderr, "failure in sk_push\n");
-#endif
er = 2;
goto err;
}
@@ -177,10 +173,8 @@ TXT_DB_read(BIO *in, int num)
err:
BUF_MEM_free(buf);
if (er) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
if (er == 1)
fprintf(stderr, "malloc failure\n");
-#endif
if (ret != NULL) {
if (ret->data != NULL)
sk_OPENSSL_PSTRING_free(ret->data);
diff --git a/lib/libssl/src/crypto/txt_db/txt_db.c b/lib/libssl/src/crypto/txt_db/txt_db.c
index 69fd2ba5bf0..a2afa3df234 100644
--- a/lib/libssl/src/crypto/txt_db/txt_db.c
+++ b/lib/libssl/src/crypto/txt_db/txt_db.c
@@ -157,17 +157,13 @@ TXT_DB_read(BIO *in, int num)
}
*(p++)='\0';
if ((n != num) || (*f != '\0')) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
-#endif
er = 2;
goto err;
}
pp[n] = p;
if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
fprintf(stderr, "failure in sk_push\n");
-#endif
er = 2;
goto err;
}
@@ -177,10 +173,8 @@ TXT_DB_read(BIO *in, int num)
err:
BUF_MEM_free(buf);
if (er) {
-#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
if (er == 1)
fprintf(stderr, "malloc failure\n");
-#endif
if (ret != NULL) {
if (ret->data != NULL)
sk_OPENSSL_PSTRING_free(ret->data);