← Back to branch summary

~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to lib/ssl/src/ssl_handshake.hrl

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not
    supposed to.
  - Drop erlang-wx binary.
  - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they
    do not really need wx. Also drop it from -debugger; the GUI needs wx,
    but it apparently has CLI bits as well, and is also needed by -megaco,
    so let's keep the package for now.
  - debian/patches/series: Do what I meant, and enable build-options.patch
    instead.
* Additional changes:
  - Drop erlang-wx from -et
* Dropped Changes:
  - patches/pcre-crash.patch: CVE-2008-2371: outer level option with
    alternatives caused crash. (Applied Upstream)
  - fix for ssl certificate verification in newSSL: 
    ssl_cacertfile_fix.patch (Applied Upstream)
  - debian/patches/series: Enable native.patch again, to get stripped beam
    files and reduce the package size again. (build-options is what
    actually accomplished this)
  - Remove build-options.patch on advice from upstream and because it caused
    odd build failures.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/ssl/src/ssl_handshake.hrl
1
1
%%
2
2
%% %CopyrightBegin%
3
 
%% 
4
 
%% Copyright Ericsson AB 2007-2009. All Rights Reserved.
5
 
%% 
 
3
%%
 
4
%% Copyright Ericsson AB 2007-2010. All Rights Reserved.
 
5
%%
6
6
%% The contents of this file are subject to the Erlang Public License,
7
7
%% Version 1.1, (the "License"); you may not use this file except in
8
8
%% compliance with the License. You should have received a copy of the
9
9
%% Erlang Public License along with this software. If not, it can be
10
10
%% retrieved online at http://www.erlang.org/.
11
 
%% 
 
11
%%
12
12
%% Software distributed under the License is distributed on an "AS IS"
13
13
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
14
14
%% the License for the specific language governing rights and limitations
15
15
%% under the License.
16
 
%% 
 
16
%%
17
17
%% %CopyrightEnd%
18
18
%%
19
19
 
26
26
-ifndef(ssl_handshake).
27
27
-define(ssl_handshake, true).
28
28
 
 
29
-include_lib("public_key/include/public_key.hrl").
 
30
 
 
31
-type algo_oid()          :: ?'rsaEncryption' | ?'id-dsa'.
 
32
-type public_key()        :: #'RSAPublicKey'{} | integer().
 
33
-type public_key_params() :: #'Dss-Parms'{} | term().
 
34
-type public_key_info()   :: {algo_oid(), public_key(), public_key_params()}.
 
35
 
29
36
-record(session, {
30
37
          session_id,
31
38
          peer_certificate,
 
39
          own_certificate,
32
40
          compression_method,
33
41
          cipher_suite,
34
42
          master_secret,
38
46
 
39
47
-define(NUM_OF_SESSION_ID_BYTES, 32).  % TSL 1.1 & SSL 3
40
48
-define(NUM_OF_PREMASTERSECRET_BYTES, 48).
41
 
 
 
49
-define(DEFAULT_DIFFIE_HELLMAN_GENERATOR, 2).
 
50
-define(DEFAULT_DIFFIE_HELLMAN_PRIME,  16#FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF).
42
51
 
43
52
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
44
53
%%% Handsake protocol - RFC 4346 section 7.4
80
89
          random,             
81
90
          session_id,         % opaque SessionID<0..32>
82
91
          cipher_suites,      % cipher_suites<2..2^16-1>
83
 
          compression_methods % compression_methods<1..2^8-1>
 
92
          compression_methods, % compression_methods<1..2^8-1>,
 
93
          renegotiation_info
84
94
         }).
85
95
 
86
96
-record(server_hello, {
88
98
          random,             
89
99
          session_id,         % opaque SessionID<0..32>
90
100
          cipher_suite,       % cipher_suites
91
 
          compression_method  % compression_method
 
101
          compression_method, % compression_method
 
102
          renegotiation_info
92
103
         }).
93
104
 
94
105
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
194
205
          verify_data %opaque verify_data[12]
195
206
         }).
196
207
 
 
208
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
209
%% Renegotiation info  RFC 5746 section 3.2
 
210
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
211
-define(RENEGOTIATION_EXT, 16#ff01).
 
212
 
 
213
-record(renegotiation_info,{
 
214
          renegotiated_connection
 
215
         }).
 
216
 
197
217
-endif. % -ifdef(ssl_handshake).
198
218
 
199
219