~ubuntu-branches/ubuntu/lucid/openssl/lucid-security

« back to all changes in this revision

Viewing changes to crypto/asn1/t_x509.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2008-08-03 19:47:10 UTC
  • mfrom: (1.1.6 upstream) (14 gutsy)
  • mto: This revision was merged to the branch mainline in revision 26.
  • Revision ID: james.westby@ubuntu.com-20080803194710-dwlvv1y2pyzi3in2
Tags: 0.9.8g-13
Fix a problem with tlsext preventing firefox 3 from connection.
Patch from upstream CVS and part of 0.9.8h.
(Closes: #492758)

Show diffs side-by-side

added added

removed removed

Lines of Context:
445
445
int X509_NAME_print(BIO *bp, X509_NAME *name, int obase)
446
446
        {
447
447
        char *s,*c,*b;
448
 
        int ret=0,l,ll,i,first=1;
 
448
        int ret=0,l,i;
449
449
 
450
 
        ll=80-2-obase;
 
450
        l=80-2-obase;
451
451
 
452
452
        b=s=X509_NAME_oneline(name,NULL,0);
453
453
        if (!*s)
457
457
                }
458
458
        s++; /* skip the first slash */
459
459
 
460
 
        l=ll;
461
460
        c=s;
462
461
        for (;;)
463
462
                {
479
478
                        (*s == '\0'))
480
479
#endif
481
480
                        {
482
 
                        if ((l <= 0) && !first)
483
 
                                {
484
 
                                first=0;
485
 
                                if (BIO_write(bp,"\n",1) != 1) goto err;
486
 
                                for (i=0; i<obase; i++)
487
 
                                        {
488
 
                                        if (BIO_write(bp," ",1) != 1) goto err;
489
 
                                        }
490
 
                                l=ll;
491
 
                                }
492
481
                        i=s-c;
493
482
                        if (BIO_write(bp,c,i) != i) goto err;
494
483
                        c+=i;