← Back to branch summary

~ubuntu-branches/ubuntu/trusty/openssl/trusty

« back to all changes in this revision

Viewing changes to crypto/rsa/rsa_ameth.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2014-01-08 15:57:24 UTC
  • mfrom: (11.1.46 sid)
  • Revision ID: package-import@ubuntu.com-20140108155724-kl61on9fyqmod2z9
Tags: 1.0.1f-1ubuntu1
* Merge with Debian, remaining changes.
  - debian/libssl1.0.0.postinst:
    + Display a system restart required notification on libssl1.0.0
      upgrade on servers.
    + Use a different priority for libssl1.0.0/restart-services depending
      on whether a desktop, or server dist-upgrade is being performed.
  - debian/{libssl1.0.0-udeb.dirs, control, rules}: Create
    libssl1.0.0-udeb, for the benefit of wget-udeb (no wget-udeb package
    in Debian).
  - debian/{libcrypto1.0.0-udeb.dirs, libssl1.0.0.dirs, libssl1.0.0.files,
    rules}: Move runtime libraries to /lib, for the benefit of
    wpasupplicant.
  - debian/patches/perlpath-quilt.patch: Don't change perl #! paths under
    .pc.
  - debian/rules:
    + Don't run 'make test' when cross-building.
    + Use host compiler when cross-building.  Patch from Neil Williams.
    + Don't build for processors no longer supported: i586 (on i386)
    + Fix Makefile to properly clean up libs/ dirs in clean target.
    + Replace duplicate files in the doc directory with symlinks.
  - debian/control: Mark Debian Vcs-* as XS-Debian-Vcs-*
  - debian/patches/ubuntu_deb676533_arm_asm.patch: Enable arm assembly
    code.
  - debian/rules: Enable optimized 64bit elliptic curve code contributed
    by Google.
* Dropped changes:
  - debian/patches/arm64-support: included in debian-targets.patch
  - debian/patches/no_default_rdrand.patch: upstream
  - debian/patches/openssl-1.0.1e-env-zlib.patch: zlib is now completely
    disabled in debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/rsa/rsa_ameth.c
351
351
 
352
352
        if (!BIO_indent(bp, indent, 128))
353
353
                goto err;
354
 
        if (BIO_puts(bp, "Salt Length: ") <= 0)
 
354
        if (BIO_puts(bp, "Salt Length: 0x") <= 0)
355
355
                        goto err;
356
356
        if (pss->saltLength)
357
357
                {
358
358
                if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0)
359
359
                        goto err;
360
360
                }
361
 
        else if (BIO_puts(bp, "20 (default)") <= 0)
 
361
        else if (BIO_puts(bp, "0x14 (default)") <= 0)
362
362
                goto err;
363
363
        BIO_puts(bp, "\n");
364
364
 
365
365
        if (!BIO_indent(bp, indent, 128))
366
366
                goto err;
367
 
        if (BIO_puts(bp, "Trailer Field: ") <= 0)
 
367
        if (BIO_puts(bp, "Trailer Field: 0x") <= 0)
368
368
                        goto err;
369
369
        if (pss->trailerField)
370
370
                {
371
371
                if (i2a_ASN1_INTEGER(bp, pss->trailerField) <= 0)
372
372
                        goto err;
373
373
                }
374
 
        else if (BIO_puts(bp, "0xbc (default)") <= 0)
 
374
        else if (BIO_puts(bp, "BC (default)") <= 0)
375
375
                goto err;
376
376
        BIO_puts(bp, "\n");
377
377
        
435
435
#endif
436
436
 
437
437
                case ASN1_PKEY_CTRL_DEFAULT_MD_NID:
438
 
                *(int *)arg2 = NID_sha1;
 
438
                *(int *)arg2 = NID_sha256;
439
439
                return 1;
440
440
 
441
441
                default: