← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ssl/ssl_locl.h

  • 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:
ssl/ssl_locl.h
621
621
extern SSL3_ENC_METHOD SSLv3_enc_data;
622
622
extern SSL3_ENC_METHOD DTLSv1_enc_data;
623
623
 
 
624
#define SSL_IS_DTLS(s) (s->method->version == DTLS1_VERSION)
 
625
 
624
626
#define IMPLEMENT_tls_meth_func(version, func_name, s_accept, s_connect, \
625
627
                                s_get_meth) \
626
628
const SSL_METHOD *func_name(void)  \
847
849
STACK_OF(SSL_CIPHER) *ssl_get_ciphers_by_id(SSL *s);
848
850
int ssl_verify_alarm_type(long type);
849
851
void ssl_load_ciphers(void);
 
852
int ssl_fill_hello_random(SSL *s, int server, unsigned char *field, int len);
850
853
 
851
854
int ssl2_enc_init(SSL *s, int client);
852
855
int ssl2_generate_key_material(SSL *s);