openssl/openssl-0.9.8g-default-paths.patch

   1 diff -up openssl-0.9.8g/apps/s_server.c.default-paths openssl-0.9.8g/apps/s_server.c
   2 --- openssl-0.9.8g/apps/s_server.c.default-paths        2007-12-13 17:41:34.000000000 +0100
   3 +++ openssl-0.9.8g/apps/s_server.c      2007-12-13 17:36:58.000000000 +0100
   4 @@ -1077,12 +1077,13 @@ bad:
   5                 }
   6  #endif
   7
   8 -       if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
   9 -               (!SSL_CTX_set_default_verify_paths(ctx)))
  10 +       if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
  11 +               {
  12 +               ERR_print_errors(bio_err);
  13 +               }
  14 +       if (!SSL_CTX_set_default_verify_paths(ctx))
  15                 {
  16 -               /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
  17                 ERR_print_errors(bio_err);
  18 -               /* goto end; */
  19                 }
  20         store = SSL_CTX_get_cert_store(ctx);
  21         X509_STORE_set_flags(store, vflags);
  22 @@ -1132,8 +1133,11 @@ bad:
  23
  24                 SSL_CTX_sess_set_cache_size(ctx2,128);
  25
  26 -               if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
  27 -                       (!SSL_CTX_set_default_verify_paths(ctx2)))
  28 +               if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath))
  29 +                       {
  30 +                       ERR_print_errors(bio_err);
  31 +                       }
  32 +               if (!SSL_CTX_set_default_verify_paths(ctx2))
  33                         {
  34                         ERR_print_errors(bio_err);
  35                         }
  36 diff -up openssl-0.9.8g/apps/s_client.c.default-paths openssl-0.9.8g/apps/s_client.c
  37 --- openssl-0.9.8g/apps/s_client.c.default-paths        2007-12-13 17:41:34.000000000 +0100
  38 +++ openssl-0.9.8g/apps/s_client.c      2007-12-13 17:37:34.000000000 +0100
  39 @@ -673,12 +673,13 @@ bad:
  40         if (!set_cert_key_stuff(ctx,cert,key))
  41                 goto end;
  42
  43 -       if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
  44 -               (!SSL_CTX_set_default_verify_paths(ctx)))
  45 +       if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
  46 +               {
  47 +               ERR_print_errors(bio_err);
  48 +               }
  49 +       if (!SSL_CTX_set_default_verify_paths(ctx))
  50                 {
  51 -               /* BIO_printf(bio_err,"error setting default verify locations\n"); */
  52                 ERR_print_errors(bio_err);
  53 -               /* goto end; */
  54                 }
  55
  56         store = SSL_CTX_get_cert_store(ctx);
  57 diff -up openssl-0.9.8g/apps/s_time.c.default-paths openssl-0.9.8g/apps/s_time.c
  58 --- openssl-0.9.8g/apps/s_time.c.default-paths  2003-12-27 15:40:17.000000000 +0100
  59 +++ openssl-0.9.8g/apps/s_time.c        2007-12-13 17:35:27.000000000 +0100
  60 @@ -476,12 +476,13 @@ int MAIN(int argc, char **argv)
  61
  62         SSL_load_error_strings();
  63
  64 -       if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
  65 -               (!SSL_CTX_set_default_verify_paths(tm_ctx)))
  66 +       if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
  67 +               {
  68 +               ERR_print_errors(bio_err);
  69 +               }
  70 +       if (!SSL_CTX_set_default_verify_paths(tm_ctx))
  71                 {
  72 -               /* BIO_printf(bio_err,"error setting default verify locations\n"); */
  73                 ERR_print_errors(bio_err);
  74 -               /* goto end; */
  75                 }
  76
  77         if (tm_cipher == NULL)