summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-05-23 16:10:02 +0000
committerjsing <>2014-05-23 16:10:02 +0000
commit4c437d3b4323b5ac149e32aebdc90ce3f849067a (patch)
tree1147bbda971015e04f1582634220db125e705f0a /src
parente96c8630b74185835a7b44bdfc50b1f65daad9f2 (diff)
downloadopenbsd-4c437d3b4323b5ac149e32aebdc90ce3f849067a.tar.gz
openbsd-4c437d3b4323b5ac149e32aebdc90ce3f849067a.tar.bz2
openbsd-4c437d3b4323b5ac149e32aebdc90ce3f849067a.zip
Calling signal once to ignore SIGPIPE is sufficient - we do not need to do
this again in each app. ok miod@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/apps/asn1pars.c2
-rw-r--r--src/lib/libssl/src/apps/ca.c2
-rw-r--r--src/lib/libssl/src/apps/ciphers.c2
-rw-r--r--src/lib/libssl/src/apps/cms.c2
-rw-r--r--src/lib/libssl/src/apps/crl.c2
-rw-r--r--src/lib/libssl/src/apps/crl2p7.c2
-rw-r--r--src/lib/libssl/src/apps/dgst.c2
-rw-r--r--src/lib/libssl/src/apps/dh.c2
-rw-r--r--src/lib/libssl/src/apps/dhparam.c2
-rw-r--r--src/lib/libssl/src/apps/dsa.c2
-rw-r--r--src/lib/libssl/src/apps/dsaparam.c2
-rw-r--r--src/lib/libssl/src/apps/ec.c2
-rw-r--r--src/lib/libssl/src/apps/ecparam.c2
-rw-r--r--src/lib/libssl/src/apps/enc.c2
-rw-r--r--src/lib/libssl/src/apps/engine.c1
-rw-r--r--src/lib/libssl/src/apps/errstr.c2
-rw-r--r--src/lib/libssl/src/apps/gendh.c2
-rw-r--r--src/lib/libssl/src/apps/gendsa.c2
-rw-r--r--src/lib/libssl/src/apps/genrsa.c1
-rw-r--r--src/lib/libssl/src/apps/passwd.c2
-rw-r--r--src/lib/libssl/src/apps/pkcs12.c2
-rw-r--r--src/lib/libssl/src/apps/pkcs7.c2
-rw-r--r--src/lib/libssl/src/apps/prime.c2
-rw-r--r--src/lib/libssl/src/apps/rand.c2
-rw-r--r--src/lib/libssl/src/apps/req.c1
-rw-r--r--src/lib/libssl/src/apps/rsa.c2
-rw-r--r--src/lib/libssl/src/apps/s_client.c1
-rw-r--r--src/lib/libssl/src/apps/s_server.c1
-rw-r--r--src/lib/libssl/src/apps/s_time.c1
-rw-r--r--src/lib/libssl/src/apps/sess_id.c2
-rw-r--r--src/lib/libssl/src/apps/smime.c2
-rw-r--r--src/lib/libssl/src/apps/speed.c1
-rw-r--r--src/lib/libssl/src/apps/spkac.c2
-rw-r--r--src/lib/libssl/src/apps/ts.c2
-rw-r--r--src/lib/libssl/src/apps/verify.c2
-rw-r--r--src/lib/libssl/src/apps/version.c2
-rw-r--r--src/lib/libssl/src/apps/x509.c2
37 files changed, 0 insertions, 67 deletions
diff --git a/src/lib/libssl/src/apps/asn1pars.c b/src/lib/libssl/src/apps/asn1pars.c
index 2d56487669..e304f3c88f 100644
--- a/src/lib/libssl/src/apps/asn1pars.c
+++ b/src/lib/libssl/src/apps/asn1pars.c
@@ -101,8 +101,6 @@ asn1parse_main(int argc, char **argv)
101 101
102 informat = FORMAT_PEM; 102 informat = FORMAT_PEM;
103 103
104 signal(SIGPIPE, SIG_IGN);
105
106 if (!load_config(bio_err, NULL)) 104 if (!load_config(bio_err, NULL))
107 goto end; 105 goto end;
108 106
diff --git a/src/lib/libssl/src/apps/ca.c b/src/lib/libssl/src/apps/ca.c
index 8217f36198..87b5dd1511 100644
--- a/src/lib/libssl/src/apps/ca.c
+++ b/src/lib/libssl/src/apps/ca.c
@@ -299,8 +299,6 @@ ca_main(int argc, char **argv)
299 char *tofree = NULL; 299 char *tofree = NULL;
300 DB_ATTR db_attr; 300 DB_ATTR db_attr;
301 301
302 signal(SIGPIPE, SIG_IGN);
303
304 conf = NULL; 302 conf = NULL;
305 key = NULL; 303 key = NULL;
306 section = NULL; 304 section = NULL;
diff --git a/src/lib/libssl/src/apps/ciphers.c b/src/lib/libssl/src/apps/ciphers.c
index 0e3b8277da..0e3e62a12e 100644
--- a/src/lib/libssl/src/apps/ciphers.c
+++ b/src/lib/libssl/src/apps/ciphers.c
@@ -94,8 +94,6 @@ ciphers_main(int argc, char **argv)
94 94
95 meth = SSLv3_server_method(); 95 meth = SSLv3_server_method();
96 96
97 signal(SIGPIPE, SIG_IGN);
98
99 STDout = BIO_new_fp(stdout, BIO_NOCLOSE); 97 STDout = BIO_new_fp(stdout, BIO_NOCLOSE);
100 if (!load_config(bio_err, NULL)) 98 if (!load_config(bio_err, NULL))
101 goto end; 99 goto end;
diff --git a/src/lib/libssl/src/apps/cms.c b/src/lib/libssl/src/apps/cms.c
index d85690cf4b..56a7c95630 100644
--- a/src/lib/libssl/src/apps/cms.c
+++ b/src/lib/libssl/src/apps/cms.c
@@ -145,8 +145,6 @@ cms_main(int argc, char **argv)
145 args = argv + 1; 145 args = argv + 1;
146 ret = 1; 146 ret = 1;
147 147
148 signal(SIGPIPE, SIG_IGN);
149
150 if (!load_config(bio_err, NULL)) 148 if (!load_config(bio_err, NULL))
151 goto end; 149 goto end;
152 150
diff --git a/src/lib/libssl/src/apps/crl.c b/src/lib/libssl/src/apps/crl.c
index 0d17ba9153..89be07a799 100644
--- a/src/lib/libssl/src/apps/crl.c
+++ b/src/lib/libssl/src/apps/crl.c
@@ -124,8 +124,6 @@ crl_main(int argc, char **argv)
124 int do_ver = 0; 124 int do_ver = 0;
125 const EVP_MD *md_alg, *digest = EVP_sha1(); 125 const EVP_MD *md_alg, *digest = EVP_sha1();
126 126
127 signal(SIGPIPE, SIG_IGN);
128
129 if (!load_config(bio_err, NULL)) 127 if (!load_config(bio_err, NULL))
130 goto end; 128 goto end;
131 129
diff --git a/src/lib/libssl/src/apps/crl2p7.c b/src/lib/libssl/src/apps/crl2p7.c
index 9d3552ab88..eb6b6f5180 100644
--- a/src/lib/libssl/src/apps/crl2p7.c
+++ b/src/lib/libssl/src/apps/crl2p7.c
@@ -99,8 +99,6 @@ crl2pkcs7_main(int argc, char **argv)
99 STACK_OF(X509) * cert_stack = NULL; 99 STACK_OF(X509) * cert_stack = NULL;
100 int ret = 1, nocrl = 0; 100 int ret = 1, nocrl = 0;
101 101
102 signal(SIGPIPE, SIG_IGN);
103
104 infile = NULL; 102 infile = NULL;
105 outfile = NULL; 103 outfile = NULL;
106 informat = FORMAT_PEM; 104 informat = FORMAT_PEM;
diff --git a/src/lib/libssl/src/apps/dgst.c b/src/lib/libssl/src/apps/dgst.c
index ce0d643f64..23b7d40cc5 100644
--- a/src/lib/libssl/src/apps/dgst.c
+++ b/src/lib/libssl/src/apps/dgst.c
@@ -129,8 +129,6 @@ dgst_main(int argc, char **argv)
129 char *mac_name = NULL; 129 char *mac_name = NULL;
130 STACK_OF(OPENSSL_STRING) * sigopts = NULL, *macopts = NULL; 130 STACK_OF(OPENSSL_STRING) * sigopts = NULL, *macopts = NULL;
131 131
132 signal(SIGPIPE, SIG_IGN);
133
134 if ((buf = (unsigned char *) malloc(BUFSIZE)) == NULL) { 132 if ((buf = (unsigned char *) malloc(BUFSIZE)) == NULL) {
135 BIO_printf(bio_err, "out of memory\n"); 133 BIO_printf(bio_err, "out of memory\n");
136 goto end; 134 goto end;
diff --git a/src/lib/libssl/src/apps/dh.c b/src/lib/libssl/src/apps/dh.c
index e7e6e1d874..e598350638 100644
--- a/src/lib/libssl/src/apps/dh.c
+++ b/src/lib/libssl/src/apps/dh.c
@@ -99,8 +99,6 @@ dh_main(int argc, char **argv)
99 char *engine; 99 char *engine;
100#endif 100#endif
101 101
102 signal(SIGPIPE, SIG_IGN);
103
104 if (!load_config(bio_err, NULL)) 102 if (!load_config(bio_err, NULL))
105 goto end; 103 goto end;
106 104
diff --git a/src/lib/libssl/src/apps/dhparam.c b/src/lib/libssl/src/apps/dhparam.c
index 3973ad0586..3245e69d75 100644
--- a/src/lib/libssl/src/apps/dhparam.c
+++ b/src/lib/libssl/src/apps/dhparam.c
@@ -165,8 +165,6 @@ dhparam_main(int argc, char **argv)
165#endif 165#endif
166 int num = 0, g = 0; 166 int num = 0, g = 0;
167 167
168 signal(SIGPIPE, SIG_IGN);
169
170 if (!load_config(bio_err, NULL)) 168 if (!load_config(bio_err, NULL))
171 goto end; 169 goto end;
172 170
diff --git a/src/lib/libssl/src/apps/dsa.c b/src/lib/libssl/src/apps/dsa.c
index c35d15016a..2f584e8c58 100644
--- a/src/lib/libssl/src/apps/dsa.c
+++ b/src/lib/libssl/src/apps/dsa.c
@@ -116,8 +116,6 @@ dsa_main(int argc, char **argv)
116 116
117 int pvk_encr = 2; 117 int pvk_encr = 2;
118 118
119 signal(SIGPIPE, SIG_IGN);
120
121 if (!load_config(bio_err, NULL)) 119 if (!load_config(bio_err, NULL))
122 goto end; 120 goto end;
123 121
diff --git a/src/lib/libssl/src/apps/dsaparam.c b/src/lib/libssl/src/apps/dsaparam.c
index 2c0cfc7989..a4eb5b5dfc 100644
--- a/src/lib/libssl/src/apps/dsaparam.c
+++ b/src/lib/libssl/src/apps/dsaparam.c
@@ -126,8 +126,6 @@ dsaparam_main(int argc, char **argv)
126 int timebomb = 0; 126 int timebomb = 0;
127#endif 127#endif
128 128
129 signal(SIGPIPE, SIG_IGN);
130
131 if (!load_config(bio_err, NULL)) 129 if (!load_config(bio_err, NULL))
132 goto end; 130 goto end;
133 131
diff --git a/src/lib/libssl/src/apps/ec.c b/src/lib/libssl/src/apps/ec.c
index 452d73cfdb..708510dc7d 100644
--- a/src/lib/libssl/src/apps/ec.c
+++ b/src/lib/libssl/src/apps/ec.c
@@ -103,8 +103,6 @@ ec_main(int argc, char **argv)
103 int asn1_flag = OPENSSL_EC_NAMED_CURVE; 103 int asn1_flag = OPENSSL_EC_NAMED_CURVE;
104 int new_asn1_flag = 0; 104 int new_asn1_flag = 0;
105 105
106 signal(SIGPIPE, SIG_IGN);
107
108 if (!load_config(bio_err, NULL)) 106 if (!load_config(bio_err, NULL))
109 goto end; 107 goto end;
110 108
diff --git a/src/lib/libssl/src/apps/ecparam.c b/src/lib/libssl/src/apps/ecparam.c
index 3e8b723720..46c23a22d1 100644
--- a/src/lib/libssl/src/apps/ecparam.c
+++ b/src/lib/libssl/src/apps/ecparam.c
@@ -136,8 +136,6 @@ ecparam_main(int argc, char **argv)
136 *ec_order = NULL, *ec_cofactor = NULL; 136 *ec_order = NULL, *ec_cofactor = NULL;
137 unsigned char *buffer = NULL; 137 unsigned char *buffer = NULL;
138 138
139 signal(SIGPIPE, SIG_IGN);
140
141 if (!load_config(bio_err, NULL)) 139 if (!load_config(bio_err, NULL))
142 goto end; 140 goto end;
143 141
diff --git a/src/lib/libssl/src/apps/enc.c b/src/lib/libssl/src/apps/enc.c
index 5410dc52a2..cbbaa6ef88 100644
--- a/src/lib/libssl/src/apps/enc.c
+++ b/src/lib/libssl/src/apps/enc.c
@@ -130,8 +130,6 @@ enc_main(int argc, char **argv)
130#endif 130#endif
131 const EVP_MD *dgst = NULL; 131 const EVP_MD *dgst = NULL;
132 132
133 signal(SIGPIPE, SIG_IGN);
134
135 if (!load_config(bio_err, NULL)) 133 if (!load_config(bio_err, NULL))
136 goto end; 134 goto end;
137 135
diff --git a/src/lib/libssl/src/apps/engine.c b/src/lib/libssl/src/apps/engine.c
index 07d69263d0..76db58b0db 100644
--- a/src/lib/libssl/src/apps/engine.c
+++ b/src/lib/libssl/src/apps/engine.c
@@ -333,7 +333,6 @@ engine_main(int argc, char **argv)
333 BIO *bio_out = NULL; 333 BIO *bio_out = NULL;
334 const char *indent = " "; 334 const char *indent = " ";
335 335
336 signal(SIGPIPE, SIG_IGN);
337 SSL_load_error_strings(); 336 SSL_load_error_strings();
338 337
339 if (!load_config(bio_err, NULL)) 338 if (!load_config(bio_err, NULL))
diff --git a/src/lib/libssl/src/apps/errstr.c b/src/lib/libssl/src/apps/errstr.c
index 5c724285a0..7e910a5356 100644
--- a/src/lib/libssl/src/apps/errstr.c
+++ b/src/lib/libssl/src/apps/errstr.c
@@ -76,8 +76,6 @@ errstr_main(int argc, char **argv)
76 char buf[256]; 76 char buf[256];
77 unsigned long l; 77 unsigned long l;
78 78
79 signal(SIGPIPE, SIG_IGN);
80
81 SSL_load_error_strings(); 79 SSL_load_error_strings();
82 80
83 if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) { 81 if ((argc > 1) && (strcmp(argv[1], "-stats") == 0)) {
diff --git a/src/lib/libssl/src/apps/gendh.c b/src/lib/libssl/src/apps/gendh.c
index 4fd47092dd..53b09985f7 100644
--- a/src/lib/libssl/src/apps/gendh.c
+++ b/src/lib/libssl/src/apps/gendh.c
@@ -103,8 +103,6 @@ gendh_main(int argc, char **argv)
103#endif 103#endif
104 BIO *out = NULL; 104 BIO *out = NULL;
105 105
106 signal(SIGPIPE, SIG_IGN);
107
108 BN_GENCB_set(&cb, dh_cb, bio_err); 106 BN_GENCB_set(&cb, dh_cb, bio_err);
109 107
110 if (!load_config(bio_err, NULL)) 108 if (!load_config(bio_err, NULL))
diff --git a/src/lib/libssl/src/apps/gendsa.c b/src/lib/libssl/src/apps/gendsa.c
index f4f3fb0a0b..86e03ed882 100644
--- a/src/lib/libssl/src/apps/gendsa.c
+++ b/src/lib/libssl/src/apps/gendsa.c
@@ -93,8 +93,6 @@ gendsa_main(int argc, char **argv)
93 char *engine = NULL; 93 char *engine = NULL;
94#endif 94#endif
95 95
96 signal(SIGPIPE, SIG_IGN);
97
98 if (!load_config(bio_err, NULL)) 96 if (!load_config(bio_err, NULL))
99 goto end; 97 goto end;
100 98
diff --git a/src/lib/libssl/src/apps/genrsa.c b/src/lib/libssl/src/apps/genrsa.c
index 899a99fc44..300b4b0da2 100644
--- a/src/lib/libssl/src/apps/genrsa.c
+++ b/src/lib/libssl/src/apps/genrsa.c
@@ -114,7 +114,6 @@ genrsa_main(int argc, char **argv)
114 if (!bn) 114 if (!bn)
115 goto err; 115 goto err;
116 116
117 signal(SIGPIPE, SIG_IGN);
118 BN_GENCB_set(&cb, genrsa_cb, bio_err); 117 BN_GENCB_set(&cb, genrsa_cb, bio_err);
119 118
120 if (!load_config(bio_err, NULL)) 119 if (!load_config(bio_err, NULL))
diff --git a/src/lib/libssl/src/apps/passwd.c b/src/lib/libssl/src/apps/passwd.c
index e9d0949d74..ef548c87f8 100644
--- a/src/lib/libssl/src/apps/passwd.c
+++ b/src/lib/libssl/src/apps/passwd.c
@@ -72,8 +72,6 @@ passwd_main(int argc, char **argv)
72 int usecrypt = 0, use1 = 0, useapr1 = 0; 72 int usecrypt = 0, use1 = 0, useapr1 = 0;
73 size_t pw_maxlen = 0; 73 size_t pw_maxlen = 0;
74 74
75 signal(SIGPIPE, SIG_IGN);
76
77 if (!load_config(bio_err, NULL)) 75 if (!load_config(bio_err, NULL))
78 goto err; 76 goto err;
79 77
diff --git a/src/lib/libssl/src/apps/pkcs12.c b/src/lib/libssl/src/apps/pkcs12.c
index 5b85f97568..f2f1e05544 100644
--- a/src/lib/libssl/src/apps/pkcs12.c
+++ b/src/lib/libssl/src/apps/pkcs12.c
@@ -131,8 +131,6 @@ pkcs12_main(int argc, char **argv)
131 char *engine = NULL; 131 char *engine = NULL;
132#endif 132#endif
133 133
134 signal(SIGPIPE, SIG_IGN);
135
136 cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC; 134 cert_pbe = NID_pbe_WithSHA1And40BitRC2_CBC;
137 135
138 enc = EVP_des_ede3_cbc(); 136 enc = EVP_des_ede3_cbc();
diff --git a/src/lib/libssl/src/apps/pkcs7.c b/src/lib/libssl/src/apps/pkcs7.c
index 57e611f9ee..f2ca4d337e 100644
--- a/src/lib/libssl/src/apps/pkcs7.c
+++ b/src/lib/libssl/src/apps/pkcs7.c
@@ -93,8 +93,6 @@ pkcs7_main(int argc, char **argv)
93 char *engine = NULL; 93 char *engine = NULL;
94#endif 94#endif
95 95
96 signal(SIGPIPE, SIG_IGN);
97
98 if (!load_config(bio_err, NULL)) 96 if (!load_config(bio_err, NULL))
99 goto end; 97 goto end;
100 98
diff --git a/src/lib/libssl/src/apps/prime.c b/src/lib/libssl/src/apps/prime.c
index de8f232851..983e8b6d3a 100644
--- a/src/lib/libssl/src/apps/prime.c
+++ b/src/lib/libssl/src/apps/prime.c
@@ -66,8 +66,6 @@ prime_main(int argc, char **argv)
66 BIGNUM *bn = NULL; 66 BIGNUM *bn = NULL;
67 BIO *bio_out; 67 BIO *bio_out;
68 68
69 signal(SIGPIPE, SIG_IGN);
70
71 --argc; 69 --argc;
72 ++argv; 70 ++argv;
73 while (argc >= 1 && **argv == '-') { 71 while (argc >= 1 && **argv == '-') {
diff --git a/src/lib/libssl/src/apps/rand.c b/src/lib/libssl/src/apps/rand.c
index c543e326b2..8606e0a40b 100644
--- a/src/lib/libssl/src/apps/rand.c
+++ b/src/lib/libssl/src/apps/rand.c
@@ -87,8 +87,6 @@ rand_main(int argc, char **argv)
87 char *engine = NULL; 87 char *engine = NULL;
88#endif 88#endif
89 89
90 signal(SIGPIPE, SIG_IGN);
91
92 if (!load_config(bio_err, NULL)) 90 if (!load_config(bio_err, NULL))
93 goto err; 91 goto err;
94 92
diff --git a/src/lib/libssl/src/apps/req.c b/src/lib/libssl/src/apps/req.c
index d306a17ec6..855f11256f 100644
--- a/src/lib/libssl/src/apps/req.c
+++ b/src/lib/libssl/src/apps/req.c
@@ -192,7 +192,6 @@ req_main(int argc, char **argv)
192#ifndef OPENSSL_NO_DES 192#ifndef OPENSSL_NO_DES
193 cipher = EVP_des_ede3_cbc(); 193 cipher = EVP_des_ede3_cbc();
194#endif 194#endif
195 signal(SIGPIPE, SIG_IGN);
196 195
197 infile = NULL; 196 infile = NULL;
198 outfile = NULL; 197 outfile = NULL;
diff --git a/src/lib/libssl/src/apps/rsa.c b/src/lib/libssl/src/apps/rsa.c
index f651f614d1..d9e90c389e 100644
--- a/src/lib/libssl/src/apps/rsa.c
+++ b/src/lib/libssl/src/apps/rsa.c
@@ -119,8 +119,6 @@ rsa_main(int argc, char **argv)
119 119
120 int pvk_encr = 2; 120 int pvk_encr = 2;
121 121
122 signal(SIGPIPE, SIG_IGN);
123
124 if (!load_config(bio_err, NULL)) 122 if (!load_config(bio_err, NULL))
125 goto end; 123 goto end;
126 124
diff --git a/src/lib/libssl/src/apps/s_client.c b/src/lib/libssl/src/apps/s_client.c
index bf4a7e082b..528864d265 100644
--- a/src/lib/libssl/src/apps/s_client.c
+++ b/src/lib/libssl/src/apps/s_client.c
@@ -467,7 +467,6 @@ s_client_main(int argc, char **argv)
467 467
468 meth = SSLv23_client_method(); 468 meth = SSLv23_client_method();
469 469
470 signal(SIGPIPE, SIG_IGN);
471 c_Pause = 0; 470 c_Pause = 0;
472 c_quiet = 0; 471 c_quiet = 0;
473 c_ign_eof = 0; 472 c_ign_eof = 0;
diff --git a/src/lib/libssl/src/apps/s_server.c b/src/lib/libssl/src/apps/s_server.c
index 99ebee4aa6..b45816b17a 100644
--- a/src/lib/libssl/src/apps/s_server.c
+++ b/src/lib/libssl/src/apps/s_server.c
@@ -723,7 +723,6 @@ s_server_main(int argc, char *argv[])
723 local_argc = argc; 723 local_argc = argc;
724 local_argv = argv; 724 local_argv = argv;
725 725
726 signal(SIGPIPE, SIG_IGN);
727 s_server_init(); 726 s_server_init();
728 727
729 if (!load_config(bio_err, NULL)) 728 if (!load_config(bio_err, NULL))
diff --git a/src/lib/libssl/src/apps/s_time.c b/src/lib/libssl/src/apps/s_time.c
index e242037cc8..f41494a04c 100644
--- a/src/lib/libssl/src/apps/s_time.c
+++ b/src/lib/libssl/src/apps/s_time.c
@@ -317,7 +317,6 @@ s_time_main(int argc, char **argv)
317 char buf[1024 * 8]; 317 char buf[1024 * 8];
318 int ver; 318 int ver;
319 319
320 signal(SIGPIPE, SIG_IGN);
321 s_time_init(); 320 s_time_init();
322 321
323 s_time_meth = SSLv23_client_method(); 322 s_time_meth = SSLv23_client_method();
diff --git a/src/lib/libssl/src/apps/sess_id.c b/src/lib/libssl/src/apps/sess_id.c
index f255f25f1b..d04c189a7d 100644
--- a/src/lib/libssl/src/apps/sess_id.c
+++ b/src/lib/libssl/src/apps/sess_id.c
@@ -98,8 +98,6 @@ sess_id_main(int argc, char **argv)
98 int cert = 0, noout = 0, text = 0; 98 int cert = 0, noout = 0, text = 0;
99 const char **pp; 99 const char **pp;
100 100
101 signal(SIGPIPE, SIG_IGN);
102
103 informat = FORMAT_PEM; 101 informat = FORMAT_PEM;
104 outformat = FORMAT_PEM; 102 outformat = FORMAT_PEM;
105 103
diff --git a/src/lib/libssl/src/apps/smime.c b/src/lib/libssl/src/apps/smime.c
index 69d47ee18f..fe5d0f597d 100644
--- a/src/lib/libssl/src/apps/smime.c
+++ b/src/lib/libssl/src/apps/smime.c
@@ -122,8 +122,6 @@ smime_main(int argc, char **argv)
122 args = argv + 1; 122 args = argv + 1;
123 ret = 1; 123 ret = 1;
124 124
125 signal(SIGPIPE, SIG_IGN);
126
127 if (!load_config(bio_err, NULL)) 125 if (!load_config(bio_err, NULL))
128 goto end; 126 goto end;
129 127
diff --git a/src/lib/libssl/src/apps/speed.c b/src/lib/libssl/src/apps/speed.c
index d25db09ada..d7e212178a 100644
--- a/src/lib/libssl/src/apps/speed.c
+++ b/src/lib/libssl/src/apps/speed.c
@@ -521,7 +521,6 @@ speed_main(int argc, char **argv)
521 usertime = -1; 521 usertime = -1;
522#endif 522#endif
523 523
524 signal(SIGPIPE, SIG_IGN);
525 memset(results, 0, sizeof(results)); 524 memset(results, 0, sizeof(results));
526#ifndef OPENSSL_NO_DSA 525#ifndef OPENSSL_NO_DSA
527 memset(dsa_key, 0, sizeof(dsa_key)); 526 memset(dsa_key, 0, sizeof(dsa_key));
diff --git a/src/lib/libssl/src/apps/spkac.c b/src/lib/libssl/src/apps/spkac.c
index 33791c6cc6..24db1b4bed 100644
--- a/src/lib/libssl/src/apps/spkac.c
+++ b/src/lib/libssl/src/apps/spkac.c
@@ -98,8 +98,6 @@ spkac_main(int argc, char **argv)
98 char *engine = NULL; 98 char *engine = NULL;
99#endif 99#endif
100 100
101 signal(SIGPIPE, SIG_IGN);
102
103 if (!load_config(bio_err, NULL)) 101 if (!load_config(bio_err, NULL))
104 goto end; 102 goto end;
105 103
diff --git a/src/lib/libssl/src/apps/ts.c b/src/lib/libssl/src/apps/ts.c
index 2674de9a57..df2e179ce0 100644
--- a/src/lib/libssl/src/apps/ts.c
+++ b/src/lib/libssl/src/apps/ts.c
@@ -157,8 +157,6 @@ ts_main(int argc, char **argv)
157 157
158 ERR_load_crypto_strings(); 158 ERR_load_crypto_strings();
159 159
160 signal(SIGPIPE, SIG_IGN);
161
162 if (!load_config(bio_err, NULL)) 160 if (!load_config(bio_err, NULL))
163 goto cleanup; 161 goto cleanup;
164 162
diff --git a/src/lib/libssl/src/apps/verify.c b/src/lib/libssl/src/apps/verify.c
index b691460a9e..209ea9bbf5 100644
--- a/src/lib/libssl/src/apps/verify.c
+++ b/src/lib/libssl/src/apps/verify.c
@@ -98,8 +98,6 @@ verify_main(int argc, char **argv)
98 98
99 ERR_load_crypto_strings(); 99 ERR_load_crypto_strings();
100 100
101 signal(SIGPIPE, SIG_IGN);
102
103 if (!load_config(bio_err, NULL)) 101 if (!load_config(bio_err, NULL))
104 goto end; 102 goto end;
105 103
diff --git a/src/lib/libssl/src/apps/version.c b/src/lib/libssl/src/apps/version.c
index cac5b6f145..6c42db0dbb 100644
--- a/src/lib/libssl/src/apps/version.c
+++ b/src/lib/libssl/src/apps/version.c
@@ -144,8 +144,6 @@ version_main(int argc, char **argv)
144 int cflags = 0, version = 0, date = 0, options = 0, platform = 0, 144 int cflags = 0, version = 0, date = 0, options = 0, platform = 0,
145 dir = 0; 145 dir = 0;
146 146
147 signal(SIGPIPE, SIG_IGN);
148
149 if (argc == 1) 147 if (argc == 1)
150 version = 1; 148 version = 1;
151 for (i = 1; i < argc; i++) { 149 for (i = 1; i < argc; i++) {
diff --git a/src/lib/libssl/src/apps/x509.c b/src/lib/libssl/src/apps/x509.c
index e77fd4ddd3..eb1e2d3d7a 100644
--- a/src/lib/libssl/src/apps/x509.c
+++ b/src/lib/libssl/src/apps/x509.c
@@ -211,8 +211,6 @@ x509_main(int argc, char **argv)
211 211
212 reqfile = 0; 212 reqfile = 0;
213 213
214 signal(SIGPIPE, SIG_IGN);
215
216 if (!load_config(bio_err, NULL)) 214 if (!load_config(bio_err, NULL))
217 goto end; 215 goto end;
218 216