summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/x509v3/v3_utl.c
diff options
context:
space:
mode:
authordoug <>2015-02-07 13:19:15 +0000
committerdoug <>2015-02-07 13:19:15 +0000
commitbd790e322a40e6362231f517d5795d4079eeb2a2 (patch)
tree1f11c8eab9ee5f3f265f1010c299c7fd574d9cdf /src/lib/libcrypto/x509v3/v3_utl.c
parentff826d3cb94a579275eb6e97b3cf80ca69016d4b (diff)
downloadopenbsd-bd790e322a40e6362231f517d5795d4079eeb2a2.tar.gz
openbsd-bd790e322a40e6362231f517d5795d4079eeb2a2.tar.bz2
openbsd-bd790e322a40e6362231f517d5795d4079eeb2a2.zip
Delete a lot of #if 0 code in libressl.
There are a few instances where #if 1 is removed but the code remains. Based on the following OpenSSL commits. Some of the commits weren't strictly deletions so they are going to be split up into separate commits. 6f91b017bbb7140f816721141ac156d1b828a6b3 3d47c1d331fdc7574d2275cda1a630ccdb624b08 dfb56425b68314b2b57e17c82c1df42e7a015132 c8fa2356a00cbaada8963f739e5570298311a060 f16a64d11f55c01f56baa62ebf1dec7f8fe718cb 9ccc00ef6ea65567622e40c49aca43f2c6d79cdb 02a938c953b3e1ced71d9a832de1618f907eb96d 75d0ebef2aef7a2c77b27575b8da898e22f3ccd5 d6fbb194095312f4722c81c9362dbd0de66cb656 6f1a93ad111c7dfe36a09a976c4c009079b19ea1 1a5adcfb5edfe23908b350f8757df405b0f5f71f 8de24b792743d11e1d5a0dcd336a49368750c577 a2b18e657ea1a932d125154f4e13ab2258796d90 8e964419603d2478dfb391c66e7ccb2dcc9776b4 32dfde107636ac9bc62a5b3233fe2a54dbc27008 input + ok jsing@, miod@, tedu@
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_utl.c')
-rw-r--r--src/lib/libcrypto/x509v3/v3_utl.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_utl.c b/src/lib/libcrypto/x509v3/v3_utl.c
index 99090f3cd2..ee135a0b52 100644
--- a/src/lib/libcrypto/x509v3/v3_utl.c
+++ b/src/lib/libcrypto/x509v3/v3_utl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: v3_utl.c,v 1.23 2014/07/13 16:03:10 beck Exp $ */ 1/* $OpenBSD: v3_utl.c,v 1.24 2015/02/07 13:19:15 doug Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -328,9 +328,6 @@ X509V3_parse_list(const char *line)
328 *p = 0; 328 *p = 0;
329 ntmp = strip_spaces(q); 329 ntmp = strip_spaces(q);
330 q = p + 1; 330 q = p + 1;
331#if 0
332 printf("%s\n", ntmp);
333#endif
334 if (!ntmp) { 331 if (!ntmp) {
335 X509V3err(X509V3_F_X509V3_PARSE_LIST, 332 X509V3err(X509V3_F_X509V3_PARSE_LIST,
336 X509V3_R_INVALID_NULL_NAME); 333 X509V3_R_INVALID_NULL_NAME);
@@ -345,9 +342,6 @@ X509V3_parse_list(const char *line)
345 state = HDR_NAME; 342 state = HDR_NAME;
346 *p = 0; 343 *p = 0;
347 vtmp = strip_spaces(q); 344 vtmp = strip_spaces(q);
348#if 0
349 printf("%s\n", ntmp);
350#endif
351 if (!vtmp) { 345 if (!vtmp) {
352 X509V3err(X509V3_F_X509V3_PARSE_LIST, 346 X509V3err(X509V3_F_X509V3_PARSE_LIST,
353 X509V3_R_INVALID_NULL_VALUE); 347 X509V3_R_INVALID_NULL_VALUE);
@@ -363,9 +357,6 @@ X509V3_parse_list(const char *line)
363 357
364 if (state == HDR_VALUE) { 358 if (state == HDR_VALUE) {
365 vtmp = strip_spaces(q); 359 vtmp = strip_spaces(q);
366#if 0
367 printf("%s=%s\n", ntmp, vtmp);
368#endif
369 if (!vtmp) { 360 if (!vtmp) {
370 X509V3err(X509V3_F_X509V3_PARSE_LIST, 361 X509V3err(X509V3_F_X509V3_PARSE_LIST,
371 X509V3_R_INVALID_NULL_VALUE); 362 X509V3_R_INVALID_NULL_VALUE);
@@ -374,9 +365,6 @@ X509V3_parse_list(const char *line)
374 X509V3_add_value(ntmp, vtmp, &values); 365 X509V3_add_value(ntmp, vtmp, &values);
375 } else { 366 } else {
376 ntmp = strip_spaces(q); 367 ntmp = strip_spaces(q);
377#if 0
378 printf("%s\n", ntmp);
379#endif
380 if (!ntmp) { 368 if (!ntmp) {
381 X509V3err(X509V3_F_X509V3_PARSE_LIST, 369 X509V3err(X509V3_F_X509V3_PARSE_LIST,
382 X509V3_R_INVALID_NULL_NAME); 370 X509V3_R_INVALID_NULL_NAME);