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

« back to all changes in this revision

Viewing changes to ssl/d1_both.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:
214
214
static void
215
215
dtls1_hm_fragment_free(hm_fragment *frag)
216
216
        {
 
217
 
 
218
        if (frag->msg_header.is_ccs)
 
219
                {
 
220
                EVP_CIPHER_CTX_free(frag->msg_header.saved_retransmit_state.enc_write_ctx);
 
221
                EVP_MD_CTX_destroy(frag->msg_header.saved_retransmit_state.write_hash);
 
222
                }
217
223
        if (frag->fragment) OPENSSL_free(frag->fragment);
218
224
        if (frag->reassembly) OPENSSL_free(frag->reassembly);
219
225
        OPENSSL_free(frag);
313
319
                                s->init_off -= DTLS1_HM_HEADER_LENGTH;
314
320
                                s->init_num += DTLS1_HM_HEADER_LENGTH;
315
321
 
316
 
                                /* write atleast DTLS1_HM_HEADER_LENGTH bytes */
317
 
                                if ( len <= DTLS1_HM_HEADER_LENGTH)  
318
 
                                        len += DTLS1_HM_HEADER_LENGTH;
 
322
                                if ( s->init_num > curr_mtu)
 
323
                                        len = curr_mtu;
 
324
                                else
 
325
                                        len = s->init_num;
319
326
                                }
320
327
 
321
328
                        dtls1_fix_message_header(s, frag_off,