diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-02-19 01:29:29 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-02-19 01:29:29 +0000 |
commit | 0ca5f8b15c927d56004d3b53744ab68e6ec1b79b (patch) | |
tree | a04d70b9b38d66f1b52aa45ccddc39051da5ce14 /crypto/x509v3 | |
parent | 6b056c414d1a80055405976ddf09d4dfee85ecf8 (diff) | |
download | openssl-0ca5f8b15c927d56004d3b53744ab68e6ec1b79b.zip openssl-0ca5f8b15c927d56004d3b53744ab68e6ec1b79b.tar.gz openssl-0ca5f8b15c927d56004d3b53744ab68e6ec1b79b.tar.bz2 |
Overhaul 'crl' application, add a proper X509_CRL_print function and start
to support CRL extensions.
Diffstat (limited to 'crypto/x509v3')
-rw-r--r-- | crypto/x509v3/Makefile.ssl | 5 | ||||
-rw-r--r-- | crypto/x509v3/v3_bitst.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_int.c | 80 | ||||
-rw-r--r-- | crypto/x509v3/v3_lib.c | 3 | ||||
-rw-r--r-- | crypto/x509v3/v3_pku.c | 2 | ||||
-rw-r--r-- | crypto/x509v3/v3_utl.c | 19 | ||||
-rw-r--r-- | crypto/x509v3/v3err.c | 1 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.err | 1 | ||||
-rw-r--r-- | crypto/x509v3/x509v3.h | 3 |
9 files changed, 108 insertions, 8 deletions
diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl index 500cfd3..77604d6 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile.ssl @@ -24,9 +24,10 @@ 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_pku.c v3_int.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_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 SRC= $(LIBSRC) diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c index 3e5d0d9..2b2cc59 100644 --- a/crypto/x509v3/v3_bitst.c +++ b/crypto/x509v3/v3_bitst.c @@ -1,4 +1,4 @@ -/* v3_bitstr.c */ +/* v3_bitst.c */ /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL * project 1999. */ diff --git a/crypto/x509v3/v3_int.c b/crypto/x509v3/v3_int.c new file mode 100644 index 0000000..6c966b3 --- /dev/null +++ b/crypto/x509v3/v3_int.c @@ -0,0 +1,80 @@ +/* v3_int.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 <stdlib.h> +#include <pem.h> +#include <err.h> +#include "x509v3.h" + +static ASN1_INTEGER *asn1_integer_new(); + +X509V3_EXT_METHOD v3_crl_num = { +NID_crl_number, 0, +(X509V3_EXT_NEW)asn1_integer_new, ASN1_STRING_free, +(X509V3_EXT_D2I)d2i_ASN1_INTEGER, +i2d_ASN1_INTEGER, +(X509V3_EXT_I2S)i2s_ASN1_INTEGER, +(X509V3_EXT_S2I)NULL, +NULL, NULL, NULL, NULL}; + + +static ASN1_INTEGER *asn1_integer_new() +{ + return ASN1_INTEGER_new(); +} diff --git a/crypto/x509v3/v3_lib.c b/crypto/x509v3/v3_lib.c index c9e9cba..7b6bda4 100644 --- a/crypto/x509v3/v3_lib.c +++ b/crypto/x509v3/v3_lib.c @@ -150,6 +150,8 @@ extern X509V3_EXT_METHOD v3_bcons, v3_nscert, v3_key_usage, v3_ext_ku; extern X509V3_EXT_METHOD v3_pkey_usage_period; extern X509V3_EXT_METHOD v3_ns_ia5_list[], v3_alt[], v3_skey_id, v3_akey_id; +extern X509V3_EXT_METHOD v3_crl_num; + int X509V3_add_standard_extensions() { X509V3_EXT_add_list(v3_ns_ia5_list); @@ -161,6 +163,7 @@ int X509V3_add_standard_extensions() X509V3_EXT_add(&v3_skey_id); X509V3_EXT_add(&v3_akey_id); X509V3_EXT_add(&v3_pkey_usage_period); + X509V3_EXT_add(&v3_crl_num); return 1; } diff --git a/crypto/x509v3/v3_pku.c b/crypto/x509v3/v3_pku.c index f6d314f..7de1718 100644 --- a/crypto/x509v3/v3_pku.c +++ b/crypto/x509v3/v3_pku.c @@ -1,4 +1,4 @@ -/* v3_akey.c */ +/* v3_pku.c */ /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL * project 1999. */ diff --git a/crypto/x509v3/v3_utl.c b/crypto/x509v3/v3_utl.c index 45a3a56..2b4d079 100644 --- a/crypto/x509v3/v3_utl.c +++ b/crypto/x509v3/v3_utl.c @@ -133,19 +133,30 @@ STACK **extlist; return 1; } +char *i2s_ASN1_INTEGER(method, a) +X509V3_EXT_METHOD *method; +ASN1_INTEGER *a; +{ + BIGNUM *bntmp = NULL; + char *strtmp = NULL; + if(!a) return NULL; + if(!(bntmp = ASN1_INTEGER_to_BN(a, NULL)) || + !(strtmp = BN_bn2dec(bntmp)) ) + X509V3err(X509V3_F_I2S_ASN1_INTEGER,ERR_R_MALLOC_FAILURE); + BN_free(bntmp); + return strtmp; +} + int X509V3_add_value_int(name, aint, extlist) char *name; ASN1_INTEGER *aint; STACK **extlist; { - BIGNUM *bntmp; char *strtmp; int ret; if(!aint) return 1; - bntmp = ASN1_INTEGER_to_BN(aint, NULL); - strtmp = BN_bn2dec(bntmp); + if(!(strtmp = i2s_ASN1_INTEGER(NULL, aint))) return 0; ret = X509V3_add_value(name, strtmp, extlist); - BN_free(bntmp); Free(strtmp); return ret; } diff --git a/crypto/x509v3/v3err.c b/crypto/x509v3/v3err.c index 50dff95..41367e0 100644 --- a/crypto/x509v3/v3err.c +++ b/crypto/x509v3/v3err.c @@ -64,6 +64,7 @@ static ERR_STRING_DATA X509V3_str_functs[]= { {ERR_PACK(0,X509V3_F_HEX_TO_STRING,0), "hex_to_string"}, +{ERR_PACK(0,X509V3_F_I2S_ASN1_INTEGER,0), "I2S_ASN1_INTEGER"}, {ERR_PACK(0,X509V3_F_S2I_ASN1_IA5STRING,0), "S2I_ASN1_IA5STRING"}, {ERR_PACK(0,X509V3_F_S2I_ASN1_OCTET_STRING,0), "s2i_ASN1_OCTET_STRING"}, {ERR_PACK(0,X509V3_F_S2I_ASN1_SKEY_ID,0), "S2I_ASN1_SKEY_ID"}, diff --git a/crypto/x509v3/x509v3.err b/crypto/x509v3/x509v3.err index 0b9fb62..fddbafd 100644 --- a/crypto/x509v3/x509v3.err +++ b/crypto/x509v3/x509v3.err @@ -2,6 +2,7 @@ /* Function codes. */ #define X509V3_F_HEX_TO_STRING 111 +#define X509V3_F_I2S_ASN1_INTEGER 120 #define X509V3_F_S2I_ASN1_IA5STRING 100 #define X509V3_F_S2I_ASN1_OCTET_STRING 112 #define X509V3_F_S2I_ASN1_SKEY_ID 114 diff --git a/crypto/x509v3/x509v3.h b/crypto/x509v3/x509v3.h index 75a18b9..c6f7a48 100644 --- a/crypto/x509v3/x509v3.h +++ b/crypto/x509v3/x509v3.h @@ -250,6 +250,7 @@ int X509V3_get_value_int(CONF_VALUE *value, ASN1_INTEGER **aint); int X509V3_add_value(char *name, char *value, STACK **extlist); int X509V3_add_value_bool(char *name, int asn1_bool, STACK **extlist); int X509V3_add_value_int( char *name, ASN1_INTEGER *aint, STACK **extlist); +char * i2s_ASN1_INTEGER(X509V3_EXT_METHOD *meth, ASN1_INTEGER *aint); int X509V3_EXT_add(X509V3_EXT_METHOD *ext); int X509V3_EXT_add_alias(int nid_to, int nid_from); void X509V3_EXT_cleanup(void); @@ -315,6 +316,7 @@ int X509V3_get_value_int(); int X509V3_add_value(); int X509V3_add_value_bool(); int X509V3_add_value_int(); +char *i2s_ASN1_INTEGER(); int X509V3_EXT_add(); int X509V3_EXT_add_alias(); void X509V3_EXT_cleanup(); @@ -338,6 +340,7 @@ int X509V3_EXT_print_fp(); /* Function codes. */ #define X509V3_F_HEX_TO_STRING 111 +#define X509V3_F_I2S_ASN1_INTEGER 120 #define X509V3_F_S2I_ASN1_IA5STRING 100 #define X509V3_F_S2I_ASN1_OCTET_STRING 112 #define X509V3_F_S2I_ASN1_SKEY_ID 114 |