[CVS] OpenSSL: OpenSSL_0_9_6-stable: openssl/apps/ pkcs8.c

  OpenSSL CVS Repository
  http://cvs.openssl.org/
  ____________________________________________________________________________

  Server: cvs.openssl.org                  Name:   Richard Levitte
  Root:   /e/openssl/cvs                   Email:  levitte@xxxxxxxxxxx
  Module: openssl                          Date:   27-Sep-2003 20:31:43
  Branch: OpenSSL_0_9_6-stable             Handle: 2003092719314300

  Modified files:           (Branch: OpenSSL_0_9_6-stable)
    openssl/apps            pkcs8.c

  Log:
    Remove extra argument to BIO_printf().
    PR: 685

  Summary:
    Revision    Changes     Path
    1.16.2.2    +5  -6      openssl/apps/pkcs8.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openssl/apps/pkcs8.c
  ============================================================================
  $ cvs diff -u -r1.16.2.1 -r1.16.2.2 pkcs8.c
  --- openssl/apps/pkcs8.c      23 Oct 2002 15:07:13 -0000      1.16.2.1
  +++ openssl/apps/pkcs8.c      27 Sep 2003 18:31:43 -0000      1.16.2.2
  @@ -219,7 +219,7 @@
                }
                BIO_free(in);
                if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
  -                     BIO_printf(bio_err, "Error converting key\n", outfile);
  +                     BIO_printf(bio_err, "Error converting key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
  @@ -243,8 +243,7 @@
                        if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
                                        p8pass, strlen(p8pass),
                                        NULL, 0, iter, p8inf))) {
  -                             BIO_printf(bio_err, "Error encrypting key\n",
  -                                                              outfile);
  +                             BIO_printf(bio_err, "Error encrypting key\n");
                                ERR_print_errors(bio_err);
                                return (1);
                        }
  @@ -287,7 +286,7 @@
                }
   
                if (!p8) {
  -                     BIO_printf (bio_err, "Error reading key\n", outfile);
  +                     BIO_printf (bio_err, "Error reading key\n");
                        ERR_print_errors(bio_err);
                        return (1);
                }
  @@ -301,13 +300,13 @@
        }
   
        if (!p8inf) {
  -             BIO_printf(bio_err, "Error decrypting key\n", outfile);
  +             BIO_printf(bio_err, "Error decrypting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
   
        if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
  -             BIO_printf(bio_err, "Error converting key\n", outfile);
  +             BIO_printf(bio_err, "Error converting key\n");
                ERR_print_errors(bio_err);
                return (1);
        }
  @@ .
______________________________________________________________________
OpenSSL Project                                 http://www.openssl.org
CVS Repository Commit List                     openssl-cvs@xxxxxxxxxxx
Automated List Manager                           majordomo@xxxxxxxxxxx