Avoid warnings.

diff --git a/crypto/cms/cms_ess.c b/crypto/cms/cms_ess.c
index c3e8edf4fe8503ef329df89e78a04d23bb38d814..deb67ddde51b04b5d4ad628cd32e3aa7a9e261d8 100644 (file)
--- 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 2a8058627675c36edae7ee9f5740d7875a88ab95..dc22310ec501396c150445d9130386d28f3dc3a3 100644 (file)
--- 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 76e1a54090b3c353b4093d08f67009552ba527f6..f7e1059aa1d4c411aab7187cbc329da430b9ac5d 100644 (file)
--- 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);