← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to apps/engine.c

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-12-06 20:16:24 UTC
  • mfrom: (11.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091206201624-u126qjpqm2n2uuhu
Tags: 0.9.8k-7ubuntu1
https://launchpad.net/bugs/493392
* Merge from debian unstable, remaining changes (LP: #493392):
  - Link using -Bsymbolic-functions
  - Add support for lpia
  - Disable SSLv2 during compile
  - Ship documentation in openssl-doc, suggested by the package.
  - Use a different priority for libssl0.9.8/restart-services
    depending on whether a desktop, or server dist-upgrade is being
    performed.
  - Display a system restart required notification bubble on libssl0.9.8
    upgrade.
  - Replace duplicate files in the doc directory with symlinks.
  - Move runtime libraries to /lib, for the benefit of wpasupplicant
* Strip the patches out of the source into quilt patches
* Disable CVE-2009-3555.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/engine.c
56
56
 *
57
57
 */
58
58
 
59
 
#ifndef OPENSSL_NO_ENGINE
60
59
 
61
60
#include <stdio.h>
62
61
#include <stdlib.h>
66
65
#endif
67
66
#include "apps.h"
68
67
#include <openssl/err.h>
 
68
#ifndef OPENSSL_NO_ENGINE
69
69
#include <openssl/engine.h>
70
70
#include <openssl/ssl.h>
71
71
 
252
252
                        /* Now decide on the output */
253
253
                        if(xpos == 0)
254
254
                                /* Do an indent */
255
 
                                xpos = BIO_printf(bio_out, indent);
 
255
                                xpos = BIO_puts(bio_out, indent);
256
256
                        else
257
257
                                /* Otherwise prepend a ", " */
258
258
                                xpos += BIO_printf(bio_out, ", ");
263
263
                                        (xpos + (int)strlen(name) > line_wrap))
264
264
                                        {
265
265
                                        BIO_printf(bio_out, "\n");
266
 
                                        xpos = BIO_printf(bio_out, indent);
 
266
                                        xpos = BIO_puts(bio_out, indent);
267
267
                                        }
268
268
                                xpos += BIO_printf(bio_out, "%s", name);
269
269
                                }