← Back to branch summary

~ubuntu-branches/ubuntu/lucid/openssl/lucid-proposed

« back to all changes in this revision

Viewing changes to crypto/x509/x509.h

  • Committer: Bazaar Package Importer
  • Author(s): Nicolas Valcárcel Scerpella (Canonical)
  • Date: 2009-12-06 20:16:24 UTC
  • mfrom: (11.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20091206201624-u126qjpqm2n2uuhu
Tags: 0.9.8k-7ubuntu1
https://launchpad.net/bugs/493392
* Merge from debian unstable, remaining changes (LP: #493392):
  - Link using -Bsymbolic-functions
  - Add support for lpia
  - Disable SSLv2 during compile
  - Ship documentation in openssl-doc, suggested by the package.
  - Use a different priority for libssl0.9.8/restart-services
    depending on whether a desktop, or server dist-upgrade is being
    performed.
  - Display a system restart required notification bubble on libssl0.9.8
    upgrade.
  - Replace duplicate files in the doc directory with symlinks.
  - Move runtime libraries to /lib, for the benefit of wpasupplicant
* Strip the patches out of the source into quilt patches
* Disable CVE-2009-3555.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/x509/x509.h
146
146
        ASN1_TYPE *parameter;
147
147
        } /* X509_ALGOR */;
148
148
 
149
 
DECLARE_STACK_OF(X509_ALGOR)
150
149
DECLARE_ASN1_SET_OF(X509_ALGOR)
151
150
 
 
151
typedef STACK_OF(X509_ALGOR) X509_ALGORS;
 
152
 
152
153
typedef struct X509_val_st
153
154
        {
154
155
        ASN1_TIME *notBefore;
203
204
        ASN1_OCTET_STRING *value;
204
205
        } X509_EXTENSION;
205
206
 
 
207
typedef STACK_OF(X509_EXTENSION) X509_EXTENSIONS;
 
208
 
206
209
DECLARE_STACK_OF(X509_EXTENSION)
207
210
DECLARE_ASN1_SET_OF(X509_EXTENSION)
208
211
 
862
865
X509_CRL *X509_CRL_dup(X509_CRL *crl);
863
866
X509_REQ *X509_REQ_dup(X509_REQ *req);
864
867
X509_ALGOR *X509_ALGOR_dup(X509_ALGOR *xn);
 
868
int X509_ALGOR_set0(X509_ALGOR *alg, ASN1_OBJECT *aobj, int ptype, void *pval);
 
869
void X509_ALGOR_get0(ASN1_OBJECT **paobj, int *pptype, void **ppval,
 
870
                                                X509_ALGOR *algor);
 
871
 
865
872
X509_NAME *X509_NAME_dup(X509_NAME *xn);
866
873
X509_NAME_ENTRY *X509_NAME_ENTRY_dup(X509_NAME_ENTRY *ne);
867
874
 
883
890
X509 *          X509_REQ_to_X509(X509_REQ *r, int days,EVP_PKEY *pkey);
884
891
 
885
892
DECLARE_ASN1_FUNCTIONS(X509_ALGOR)
 
893
DECLARE_ASN1_ENCODE_FUNCTIONS(X509_ALGORS, X509_ALGORS, X509_ALGORS)
886
894
DECLARE_ASN1_FUNCTIONS(X509_VAL)
887
895
 
888
896
DECLARE_ASN1_FUNCTIONS(X509_PUBKEY)
918
926
X509_ATTRIBUTE *X509_ATTRIBUTE_create(int nid, int atrtype, void *value);
919
927
 
920
928
DECLARE_ASN1_FUNCTIONS(X509_EXTENSION)
 
929
DECLARE_ASN1_ENCODE_FUNCTIONS(X509_EXTENSIONS, X509_EXTENSIONS, X509_EXTENSIONS)
921
930
 
922
931
DECLARE_ASN1_FUNCTIONS(X509_NAME_ENTRY)
923
932
 
1191
1200
STACK_OF(X509_ATTRIBUTE) *X509at_add1_attr_by_txt(STACK_OF(X509_ATTRIBUTE) **x,
1192
1201
                        const char *attrname, int type,
1193
1202
                        const unsigned char *bytes, int len);
 
1203
void *X509at_get0_data_by_OBJ(STACK_OF(X509_ATTRIBUTE) *x,
 
1204
                                ASN1_OBJECT *obj, int lastpos, int type);
1194
1205
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_NID(X509_ATTRIBUTE **attr, int nid,
1195
1206
             int atrtype, const void *data, int len);
1196
1207
X509_ATTRIBUTE *X509_ATTRIBUTE_create_by_OBJ(X509_ATTRIBUTE **attr,