Commit a5cdb7d5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Avoid warnings.

parent 4a6bb116

crypto/cms/cms_ess.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

crypto/x509v3/v3_genn.c

+1 −1
Original line number Diff line number Diff line
@@ -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

crypto/x509v3/x509v3.h

+6 −0
Original line number Diff line number Diff line
@@ -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);