← Back to branch summary

~ubuntu-branches/ubuntu/utopic/openssl/utopic

« back to all changes in this revision

Viewing changes to crypto/x509v3/v3_pmaps.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2011-04-02 13:19:19 UTC
  • mfrom: (1.2.1 upstream) (11.2.2 experimental)
  • mto: This revision was merged to the branch mainline in revision 55.
  • Revision ID: james.westby@ubuntu.com-20110402131919-anszuslper64ey9e
Tags: 1.0.0d-1
http://bugs.debian.org/607609
* New upstream version
  - Fixes CVE-2011-0014
* Make libssl-doc Replaces/Breaks with old libssl-dev packages
  (Closes: #607609)
* Only export the symbols we should, instead of all.
* Add symbol file.
* Upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/x509v3/v3_pmaps.c
63
63
#include <openssl/conf.h>
64
64
#include <openssl/x509v3.h>
65
65
 
66
 
static void *v2i_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
67
 
                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
68
 
static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
69
 
                                void *pmps, STACK_OF(CONF_VALUE) *extlist);
 
66
static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
 
67
                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval);
 
68
static STACK_OF(CONF_VALUE) *
 
69
i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *pmps,
 
70
                    STACK_OF(CONF_VALUE) *extlist);
70
71
 
71
72
const X509V3_EXT_METHOD v3_policy_mappings = {
72
73
        NID_policy_mappings, 0,
92
93
IMPLEMENT_ASN1_ALLOC_FUNCTIONS(POLICY_MAPPING)
93
94
 
94
95
 
95
 
static STACK_OF(CONF_VALUE) *i2v_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
96
 
                void *a, STACK_OF(CONF_VALUE) *ext_list)
 
96
static STACK_OF(CONF_VALUE) *
 
97
i2v_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method, void *a,
 
98
                    STACK_OF(CONF_VALUE) *ext_list)
97
99
{
98
100
        POLICY_MAPPINGS *pmaps = a;
99
101
        POLICY_MAPPING *pmap;
109
111
        return ext_list;
110
112
}
111
113
 
112
 
static void *v2i_POLICY_MAPPINGS(X509V3_EXT_METHOD *method,
113
 
                                X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
 
114
static void *v2i_POLICY_MAPPINGS(const X509V3_EXT_METHOD *method,
 
115
                                 X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *nval)
114
116
{
115
117
        POLICY_MAPPINGS *pmaps;
116
118
        POLICY_MAPPING *pmap;