summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2014-04-26 11:08:10 +0000
committerjsing <>2014-04-26 11:08:10 +0000
commitecbe88cd439c286c4dd9eb40f64c39c2039ab7ad (patch)
tree693390abb43e6a6bfc0e51f8c864e1a901a1768c
parent9e2c15719af6fc163b5e97a71322756690aa23cb (diff)
downloadopenbsd-ecbe88cd439c286c4dd9eb40f64c39c2039ab7ad.tar.gz
openbsd-ecbe88cd439c286c4dd9eb40f64c39c2039ab7ad.tar.bz2
openbsd-ecbe88cd439c286c4dd9eb40f64c39c2039ab7ad.zip
Do you really want to build OpenSSL for 16-bit Windows? Well, we don't.
ok miod@
-rw-r--r--src/lib/libcrypto/txt_db/txt_db.c6
-rw-r--r--src/lib/libssl/src/crypto/txt_db/txt_db.c6
2 files changed, 0 insertions, 12 deletions
diff --git a/src/lib/libcrypto/txt_db/txt_db.c b/src/lib/libcrypto/txt_db/txt_db.c
index 69fd2ba5bf..a2afa3df23 100644
--- a/src/lib/libcrypto/txt_db/txt_db.c
+++ b/src/lib/libcrypto/txt_db/txt_db.c
@@ -157,17 +157,13 @@ TXT_DB_read(BIO *in, int num)
157 } 157 }
158 *(p++)='\0'; 158 *(p++)='\0';
159 if ((n != num) || (*f != '\0')) { 159 if ((n != num) || (*f != '\0')) {
160#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
161 fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f); 160 fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
162#endif
163 er = 2; 161 er = 2;
164 goto err; 162 goto err;
165 } 163 }
166 pp[n] = p; 164 pp[n] = p;
167 if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) { 165 if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
168#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
169 fprintf(stderr, "failure in sk_push\n"); 166 fprintf(stderr, "failure in sk_push\n");
170#endif
171 er = 2; 167 er = 2;
172 goto err; 168 goto err;
173 } 169 }
@@ -177,10 +173,8 @@ TXT_DB_read(BIO *in, int num)
177err: 173err:
178 BUF_MEM_free(buf); 174 BUF_MEM_free(buf);
179 if (er) { 175 if (er) {
180#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
181 if (er == 1) 176 if (er == 1)
182 fprintf(stderr, "malloc failure\n"); 177 fprintf(stderr, "malloc failure\n");
183#endif
184 if (ret != NULL) { 178 if (ret != NULL) {
185 if (ret->data != NULL) 179 if (ret->data != NULL)
186 sk_OPENSSL_PSTRING_free(ret->data); 180 sk_OPENSSL_PSTRING_free(ret->data);
diff --git a/src/lib/libssl/src/crypto/txt_db/txt_db.c b/src/lib/libssl/src/crypto/txt_db/txt_db.c
index 69fd2ba5bf..a2afa3df23 100644
--- a/src/lib/libssl/src/crypto/txt_db/txt_db.c
+++ b/src/lib/libssl/src/crypto/txt_db/txt_db.c
@@ -157,17 +157,13 @@ TXT_DB_read(BIO *in, int num)
157 } 157 }
158 *(p++)='\0'; 158 *(p++)='\0';
159 if ((n != num) || (*f != '\0')) { 159 if ((n != num) || (*f != '\0')) {
160#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
161 fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f); 160 fprintf(stderr, "wrong number of fields on line %ld (looking for field %d, got %d, '%s' left)\n",ln,num,n,f);
162#endif
163 er = 2; 161 er = 2;
164 goto err; 162 goto err;
165 } 163 }
166 pp[n] = p; 164 pp[n] = p;
167 if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) { 165 if (!sk_OPENSSL_PSTRING_push(ret->data, pp)) {
168#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16) /* temporary fix :-( */
169 fprintf(stderr, "failure in sk_push\n"); 166 fprintf(stderr, "failure in sk_push\n");
170#endif
171 er = 2; 167 er = 2;
172 goto err; 168 goto err;
173 } 169 }
@@ -177,10 +173,8 @@ TXT_DB_read(BIO *in, int num)
177err: 173err:
178 BUF_MEM_free(buf); 174 BUF_MEM_free(buf);
179 if (er) { 175 if (er) {
180#if !defined(OPENSSL_NO_STDIO) && !defined(OPENSSL_SYS_WIN16)
181 if (er == 1) 176 if (er == 1)
182 fprintf(stderr, "malloc failure\n"); 177 fprintf(stderr, "malloc failure\n");
183#endif
184 if (ret != NULL) { 178 if (ret != NULL) {
185 if (ret->data != NULL) 179 if (ret->data != NULL)
186 sk_OPENSSL_PSTRING_free(ret->data); 180 sk_OPENSSL_PSTRING_free(ret->data);