← Back to branch summary

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

« back to all changes in this revision

Viewing changes to lib/public_key/include/public_key.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/public_key/include/public_key.hrl
1
1
%%
2
2
%% %CopyrightBegin%
3
3
%% 
4
 
%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
 
4
%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
5
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
28
28
          algorithm, 
29
29
          parameters = asn1_NOVALUE}).
30
30
 
 
31
-define(DEFAULT_VERIFYFUN,
 
32
        {fun(_,{bad_cert, _} = Reason, _) ->
 
33
                 {fail, Reason};
 
34
            (_,{extension, _}, UserState) ->
 
35
                 {unknown, UserState};
 
36
            (_, valid, UserState) ->
 
37
                 {valid, UserState};
 
38
            (_, valid_peer, UserState) ->
 
39
                 {valid, UserState}
 
40
         end, []}).
 
41
 
31
42
-record(path_validation_state, {
32
43
          valid_policy_tree,
33
44
          explicit_policy,
42
53
          working_public_key_parameters,
43
54
          working_issuer_name,
44
55
          max_path_length,
45
 
          acc_errors,  %% If verify_none option is set
 
56
          verify_fun,
46
57
          user_state
47
58
         }).
48
59
 
59
70
          interim_reasons_mask
60
71
         }).
61
72
 
 
73
 
 
74
-type der_encoded()          :: binary().
 
75
-type decrypt_der()          :: binary().
 
76
-type pki_asn1_type()        ::  'Certificate' | 'RSAPrivateKey' | 'RSAPublicKey'
 
77
                               | 'DSAPrivateKey' | 'DSAPublicKey' | 'DHParameter'
 
78
                               | 'SubjectPublicKeyInfo'.
 
79
-type pem_entry()            :: {pki_asn1_type(), der_encoded() | decrypt_der(),
 
80
                                 not_encrypted | {Cipher :: string(), Salt :: binary()}}.
 
81
-type asn1_type()            :: atom(). %% see "OTP-PUB-KEY.hrl
 
82
 
62
83
-endif. % -ifdef(public_key).