diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-04-01 16:29:42 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-04-01 16:29:42 +0000 |
| commit | a5cdb7d5bd24e2ec9591d64574bf6d45f1868f44 (patch) | |
| tree | c85fdd47289caf8b45a4789eacf8145dcc48b71d /crypto | |
| parent | 4a6bb116c417c71f97c943acdbdc57c130529297 (diff) | |
| download | openssl-a5cdb7d5bd24e2ec9591d64574bf6d45f1868f44.zip openssl-a5cdb7d5bd24e2ec9591d64574bf6d45f1868f44.tar.gz openssl-a5cdb7d5bd24e2ec9591d64574bf6d45f1868f44.tar.bz2 | |
Avoid warnings.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cms/cms_ess.c | 2 | ||||
| -rw-r--r-- | crypto/x509v3/v3_genn.c | 2 | ||||
| -rw-r--r-- | crypto/x509v3/x509v3.h | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c index c3e8edf..deb67dd 100644 --- a/crypto/cms/cms_ess.c +++ b/crypto/cms/cms_ess.c @@ -232,7 +232,7 @@ int cms_Receipt_verify(CMS_ContentInfo *cms, CMS_ContentInfo *req_cms) CMS_ReceiptRequest *rr = NULL; CMS_Receipt *rct = NULL; STACK_OF(CMS_SignerInfo) *sis, *osis; - CMS_SignerInfo *si, *osi; + CMS_SignerInfo *si, *osi = NULL; ASN1_OCTET_STRING *msig, **pcont; ASN1_OBJECT *octype; unsigned char dig[EVP_MAX_MD_SIZE]; diff --git a/crypto/x509v3/v3_genn.c b/crypto/x509v3/v3_genn.c index 2a80586..dc22310 100644 --- a/crypto/x509v3/v3_genn.c +++ b/crypto/x509v3/v3_genn.c @@ -3,7 +3,7 @@ * project 1999. */ /* ==================================================================== - * Copyright (c) 1999 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2008 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 76e1a54..f7e1059 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -519,6 +519,12 @@ GENERAL_NAMES *v2i_GENERAL_NAMES(X509V3_EXT_METHOD *method, DECLARE_ASN1_FUNCTIONS(OTHERNAME) DECLARE_ASN1_FUNCTIONS(EDIPARTYNAME) int OTHERNAME_cmp(OTHERNAME *a, OTHERNAME *b); +void GENERAL_NAME_set0_value(GENERAL_NAME *a, int type, void *value); +void *GENERAL_NAME_get0_value(GENERAL_NAME *a, int *ptype); +int GENERAL_NAME_set0_othername(GENERAL_NAME *gen, + ASN1_OBJECT *oid, ASN1_TYPE *value); +int GENERAL_NAME_get0_otherName(GENERAL_NAME *gen, + ASN1_OBJECT **poid, ASN1_TYPE **pvalue); char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *ia5); ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); |