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

Add OCSP nonce extension to supported extensions. 

This is a little unusual because it can contain no
structure i.e. the extension OCTET STRING content
octets do not contain a DER encoded structure.
parent 2a86064f

crypto/ocsp/ocsp.h

+1 −0
Original line number Diff line number Diff line
@@ -568,6 +568,7 @@ void OCSP_add_standard_extension(void); 
#define OCSP_F_BASIC_RESPONSE_VERIFY			 101

#define OCSP_F_CERT_ID_NEW				 102

#define OCSP_F_CERT_STATUS_NEW				 103

#define OCSP_F_D2I_OCSP_NONCE				 109

#define OCSP_F_REQUEST_VERIFY				 104

#define OCSP_F_RESPONSE_VERIFY				 105

#define OCSP_F_S2I_OCSP_NONCE				 107

crypto/ocsp/ocsp_err.c

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static ERR_STRING_DATA OCSP_str_functs[]= 
{ERR_PACK(0,OCSP_F_BASIC_RESPONSE_VERIFY,0),	"BASIC_RESPONSE_VERIFY"},

{ERR_PACK(0,OCSP_F_CERT_ID_NEW,0),	"CERT_ID_NEW"},

{ERR_PACK(0,OCSP_F_CERT_STATUS_NEW,0),	"CERT_STATUS_NEW"},

{ERR_PACK(0,OCSP_F_D2I_OCSP_NONCE,0),	"D2I_OCSP_NONCE"},

{ERR_PACK(0,OCSP_F_REQUEST_VERIFY,0),	"REQUEST_VERIFY"},

{ERR_PACK(0,OCSP_F_RESPONSE_VERIFY,0),	"RESPONSE_VERIFY"},

{ERR_PACK(0,OCSP_F_S2I_OCSP_NONCE,0),	"S2I_OCSP_NONCE"},

crypto/x509v3/Makefile.ssl

+4 −2
Original line number Diff line number Diff line
@@ -24,10 +24,12 @@ APPS= 
LIB=$(TOP)/libcrypto.a

LIBSRC=	v3_bcons.c v3_bitst.c v3_conf.c v3_extku.c v3_ia5.c \

v3_lib.c v3_prn.c v3_utl.c v3err.c v3_genn.c v3_alt.c v3_skey.c v3_akey.c \

v3_pku.c v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c

v3_pku.c v3_int.c v3_enum.c v3_sxnet.c v3_cpols.c v3_crld.c v3_purp.c v3_info.c \

v3_nonce.c

LIBOBJ= v3_bcons.o v3_bitst.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \

v3_prn.o v3_utl.o v3err.o v3_genn.o v3_alt.o v3_skey.o v3_akey.o v3_pku.o \

v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o

v3_int.o v3_enum.o v3_sxnet.o v3_cpols.o v3_crld.o v3_purp.o v3_info.o \

v3_nonce.o



SRC= $(LIBSRC)

crypto/x509v3/ext_dat.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; 
extern X509V3_EXT_METHOD v3_pkey_usage_period, v3_sxnet, v3_info;

extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id;

extern X509V3_EXT_METHOD v3_crl_num, v3_crl_reason, v3_cpols, v3_crld;

extern X509V3_EXT_METHOD v3_ocsp_nonce;



/* This table will be searched using OBJ_bsearch so it *must* kept in

 * order of the ext_nid values.
@@ -89,6 +90,7 @@ static X509V3_EXT_METHOD *standard_exts[] = { 
&v3_crl_reason,

&v3_sxnet,

&v3_info,

&v3_ocsp_nonce

};



/* Number of standard extensions */

crypto/x509v3/v3_nonce.c

0 → 100644
+132 −0
Original line number Diff line number Diff line 
/* v3_nonce.c */

/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL

 * project 1999.

 */

/* ====================================================================

 * Copyright (c) 1999 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

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    licensing@OpenSSL.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



#include <stdio.h>

#include "cryptlib.h"

#include <openssl/conf.h>

#include <openssl/asn1.h>

#include <openssl/ocsp.h>

#include <openssl/x509v3.h>



/* OCSP nonce. This is needs special treatment because it doesn't have

 * an ASN1 encoding at all: it just contains arbitrary data.

 */



static void *ocsp_nonce_new(void);

static int i2d_ocsp_nonce(void *a, unsigned char **pp);

static void *d2i_ocsp_nonce(void *a, unsigned char **pp, long length);

static void ocsp_nonce_free(void *a);

static int i2r_ocsp_nonce(X509V3_EXT_METHOD *method, void *nonce, BIO *out, int indent);



X509V3_EXT_METHOD v3_ocsp_nonce = {

	NID_id_pkix_OCSP_Nonce, 0, NULL,

	ocsp_nonce_new,

	ocsp_nonce_free,

	d2i_ocsp_nonce,

	i2d_ocsp_nonce,

	0,0,

	0,0,

	i2r_ocsp_nonce,0,

	NULL

};



static void *ocsp_nonce_new(void)

{

	return ASN1_OCTET_STRING_new();

}



static int i2d_ocsp_nonce(void *a, unsigned char **pp)

{

	ASN1_OCTET_STRING *os = a;

	if(*pp) {

		memcpy(*pp, os->data, os->length);

		*pp += os->length;

	}

	return os->length;

}



static void *d2i_ocsp_nonce(void *a, unsigned char **pp, long length)

{

	ASN1_OCTET_STRING *os, **pos;

	pos = a;

	if(!pos || !*pos) os = ASN1_OCTET_STRING_new();

	else os = *pos;

	if(!ASN1_OCTET_STRING_set(os, *pp, length)) goto err;



	*pp += length;



	if(pos) *pos = os;

	return os;



	err:

	if(os && (!pos || (*pos != os))) M_ASN1_OCTET_STRING_free(os);

	OCSPerr(OCSP_F_D2I_OCSP_NONCE, ERR_R_MALLOC_FAILURE);

	return NULL;

}



static void ocsp_nonce_free(void *a)

{

	M_ASN1_OCTET_STRING_free(a);

}



static int i2r_ocsp_nonce(X509V3_EXT_METHOD *method, void *nonce, BIO *out, int indent)

{

	if(BIO_printf(out, "%*s", indent, "") <= 0) return 0;

	if(i2a_ASN1_STRING(out, nonce, V_ASN1_OCTET_STRING) <= 0) return 0;

	return 1;

}