From: Dr. Stephen Henson Date: Sat, 6 Feb 1999 12:35:53 +0000 (+0000) Subject: Rename v3_bitstr.c to v3_bitst.c to fit in 8+3. Rebuild MINFO to reflect X-Git-Tag: OpenSSL_0_9_2b~192 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a83d7d1491a24efb6cfcc411b29d794559aa357e;p=oweals%2Fopenssl.git Rename v3_bitstr.c to v3_bitst.c to fit in 8+3. Rebuild MINFO to reflect change. --- diff --git a/MINFO b/MINFO index 0020b055fd..131120cc2a 100644 --- a/MINFO +++ b/MINFO @@ -748,7 +748,7 @@ TEST= TOP=../.. RELATIVE_DIRECTORY= RELATIVE_DIRECTORY=crypto/x509v3 -ALL=Makefile README v3_bcons.c v3_bitstr.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c v3_prn.c v3_utl.c v3err.c x509v3.h +ALL=Makefile README 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 x509v3.h APPS= AR=ar r CC=cc @@ -763,12 +763,12 @@ HEADER=x509v3.h INCLUDES=-I.. -I../../include INSTALLTOP=/usr/local/ssl LIB=../../libcrypto.a -LIBOBJ=v3_bcons.o v3_bitstr.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o v3_prn.o v3_utl.o v3err.o -LIBSRC=v3_bcons.c v3_bitstr.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c v3_prn.c v3_utl.c v3err.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 +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 MAKE=make -f Makefile.ssl MAKEDEPEND=../../util/domd ../.. MAKEFILE=Makefile.ssl -SRC=v3_bcons.c v3_bitstr.c v3_conf.c v3_extku.c v3_ia5.c v3_lib.c v3_prn.c v3_utl.c v3err.c +SRC=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 TEST= TOP=../.. RELATIVE_DIRECTORY= diff --git a/crypto/x509v3/Makefile.ssl b/crypto/x509v3/Makefile.ssl index 1f414caa11..143c4c6b66 100644 --- a/crypto/x509v3/Makefile.ssl +++ b/crypto/x509v3/Makefile.ssl @@ -22,9 +22,9 @@ TEST= APPS= LIB=$(TOP)/libcrypto.a -LIBSRC= v3_bcons.c v3_bitstr.c v3_conf.c v3_extku.c v3_ia5.c \ +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 -LIBOBJ= v3_bcons.o v3_bitstr.o v3_conf.o v3_extku.o v3_ia5.o v3_lib.o \ +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 SRC= $(LIBSRC) @@ -98,17 +98,17 @@ v3_bcons.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h v3_bcons.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h v3_bcons.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h v3_bcons.o: ../../include/x509_vfy.h x509v3.h -v3_bitstr.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h -v3_bitstr.o: ../../include/blowfish.h ../../include/bn.h ../../include/cast.h -v3_bitstr.o: ../../include/conf.h ../../include/crypto.h ../../include/des.h -v3_bitstr.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h -v3_bitstr.o: ../../include/evp.h ../../include/idea.h ../../include/lhash.h -v3_bitstr.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h -v3_bitstr.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h -v3_bitstr.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h -v3_bitstr.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h -v3_bitstr.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h -v3_bitstr.o: ../../include/x509_vfy.h x509v3.h +v3_bitst.o: ../../include/asn1.h ../../include/asn1_mac.h ../../include/bio.h +v3_bitst.o: ../../include/blowfish.h ../../include/bn.h ../../include/cast.h +v3_bitst.o: ../../include/conf.h ../../include/crypto.h ../../include/des.h +v3_bitst.o: ../../include/dh.h ../../include/dsa.h ../../include/err.h +v3_bitst.o: ../../include/evp.h ../../include/idea.h ../../include/lhash.h +v3_bitst.o: ../../include/md2.h ../../include/md5.h ../../include/mdc2.h +v3_bitst.o: ../../include/objects.h ../../include/pem.h ../../include/pem2.h +v3_bitst.o: ../../include/pkcs7.h ../../include/rc2.h ../../include/rc4.h +v3_bitst.o: ../../include/rc5.h ../../include/ripemd.h ../../include/rsa.h +v3_bitst.o: ../../include/sha.h ../../include/stack.h ../../include/x509.h +v3_bitst.o: ../../include/x509_vfy.h x509v3.h v3_conf.o: ../../include/asn1.h ../../include/bio.h ../../include/blowfish.h v3_conf.o: ../../include/bn.h ../../include/cast.h ../../include/conf.h v3_conf.o: ../../include/crypto.h ../../include/des.h ../../include/dh.h diff --git a/crypto/x509v3/v3_bitst.c b/crypto/x509v3/v3_bitst.c new file mode 100644 index 0000000000..10ce8f04ef --- /dev/null +++ b/crypto/x509v3/v3_bitst.c @@ -0,0 +1,159 @@ +/* v3_bitstr.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 +#include +#include +#include +#include +#include +#include +#include "x509v3.h" + +#ifndef NOPROTO +static ASN1_BIT_STRING *asn1_bit_string_new(void); +static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); +static STACK *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *bits); +#else +static ASN1_BIT_STRING *asn1_bit_string_new(); +static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(); +static STACK *i2v_ASN1_BIT_STRING(); +#endif + +static BIT_STRING_BITNAME ns_cert_type_table[] = { +{0, "SSL Client", "client"}, +{1, "SSL Server", "server"}, +{2, "S/MIME", "email"}, +{3, "Object Signing", "objsign"}, +{4, "Unused", "reserved"}, +{5, "SSL CA", "sslCA"}, +{6, "S/MIME CA", "emailCA"}, +{7, "Object Signing CA", "objCA"}, +{-1, NULL, NULL} +}; + +static BIT_STRING_BITNAME key_usage_type_table[] = { +{0, "Digital Signature", "digitalSignature"}, +{1, "Non Repudiation", "nonRepudiation"}, +{2, "Key Encipherment", "keyEncipherment"}, +{3, "Data Encipherment", "dataEncipherment"}, +{4, "Key Agreement", "keyAgreement"}, +{5, "Certificate Sign", "keyCertSign"}, +{6, "CRL Sign", "cRLSign"}, +{7, "Encipher Only", "encipherOnly"}, +{8, "Decipher Only", "decipherOnly"}, +{-1, NULL, NULL} +}; + + + +X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table); +X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table); + +static ASN1_BIT_STRING *asn1_bit_string_new() +{ + return ASN1_BIT_STRING_new(); +} + +static STACK *i2v_ASN1_BIT_STRING(method, bits) +X509V3_EXT_METHOD *method; +ASN1_BIT_STRING *bits; +{ + BIT_STRING_BITNAME *bnam; + STACK *ret = NULL; + for(bnam =(BIT_STRING_BITNAME *)method->usr_data; bnam->lname; bnam++) { + if(ASN1_BIT_STRING_get_bit(bits, bnam->bitnum)) + X509V3_add_value(bnam->lname, NULL, &ret); + } + return ret; +} + +static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(method, ctx, nval) +X509V3_EXT_METHOD *method; +X509V3_CTX *ctx; +STACK *nval; +{ + CONF_VALUE *val; + ASN1_BIT_STRING *bs; + int i; + BIT_STRING_BITNAME *bnam; + if(!(bs = ASN1_BIT_STRING_new())) { + X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,ERR_R_MALLOC_FAILURE); + return NULL; + } + for(i = 0; i < sk_num(nval); i++) { + val = (CONF_VALUE *)sk_value(nval, i); + for(bnam = (BIT_STRING_BITNAME *)method->usr_data; bnam->lname; + bnam++) { + if(!strcmp(bnam->sname, val->name) || + !strcmp(bnam->lname, val->name) ) { + ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1); + break; + } + } + if(!bnam->lname) { + X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); + X509V3_conf_err(val); + ASN1_BIT_STRING_free(bs); + return NULL; + } + } + return bs; +} + + diff --git a/crypto/x509v3/v3_bitstr.c b/crypto/x509v3/v3_bitstr.c deleted file mode 100644 index 10ce8f04ef..0000000000 --- a/crypto/x509v3/v3_bitstr.c +++ /dev/null @@ -1,159 +0,0 @@ -/* v3_bitstr.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 -#include -#include -#include -#include -#include -#include -#include "x509v3.h" - -#ifndef NOPROTO -static ASN1_BIT_STRING *asn1_bit_string_new(void); -static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval); -static STACK *i2v_ASN1_BIT_STRING(X509V3_EXT_METHOD *method, ASN1_BIT_STRING *bits); -#else -static ASN1_BIT_STRING *asn1_bit_string_new(); -static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(); -static STACK *i2v_ASN1_BIT_STRING(); -#endif - -static BIT_STRING_BITNAME ns_cert_type_table[] = { -{0, "SSL Client", "client"}, -{1, "SSL Server", "server"}, -{2, "S/MIME", "email"}, -{3, "Object Signing", "objsign"}, -{4, "Unused", "reserved"}, -{5, "SSL CA", "sslCA"}, -{6, "S/MIME CA", "emailCA"}, -{7, "Object Signing CA", "objCA"}, -{-1, NULL, NULL} -}; - -static BIT_STRING_BITNAME key_usage_type_table[] = { -{0, "Digital Signature", "digitalSignature"}, -{1, "Non Repudiation", "nonRepudiation"}, -{2, "Key Encipherment", "keyEncipherment"}, -{3, "Data Encipherment", "dataEncipherment"}, -{4, "Key Agreement", "keyAgreement"}, -{5, "Certificate Sign", "keyCertSign"}, -{6, "CRL Sign", "cRLSign"}, -{7, "Encipher Only", "encipherOnly"}, -{8, "Decipher Only", "decipherOnly"}, -{-1, NULL, NULL} -}; - - - -X509V3_EXT_METHOD v3_nscert = EXT_BITSTRING(NID_netscape_cert_type, ns_cert_type_table); -X509V3_EXT_METHOD v3_key_usage = EXT_BITSTRING(NID_key_usage, key_usage_type_table); - -static ASN1_BIT_STRING *asn1_bit_string_new() -{ - return ASN1_BIT_STRING_new(); -} - -static STACK *i2v_ASN1_BIT_STRING(method, bits) -X509V3_EXT_METHOD *method; -ASN1_BIT_STRING *bits; -{ - BIT_STRING_BITNAME *bnam; - STACK *ret = NULL; - for(bnam =(BIT_STRING_BITNAME *)method->usr_data; bnam->lname; bnam++) { - if(ASN1_BIT_STRING_get_bit(bits, bnam->bitnum)) - X509V3_add_value(bnam->lname, NULL, &ret); - } - return ret; -} - -static ASN1_BIT_STRING *v2i_ASN1_BIT_STRING(method, ctx, nval) -X509V3_EXT_METHOD *method; -X509V3_CTX *ctx; -STACK *nval; -{ - CONF_VALUE *val; - ASN1_BIT_STRING *bs; - int i; - BIT_STRING_BITNAME *bnam; - if(!(bs = ASN1_BIT_STRING_new())) { - X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,ERR_R_MALLOC_FAILURE); - return NULL; - } - for(i = 0; i < sk_num(nval); i++) { - val = (CONF_VALUE *)sk_value(nval, i); - for(bnam = (BIT_STRING_BITNAME *)method->usr_data; bnam->lname; - bnam++) { - if(!strcmp(bnam->sname, val->name) || - !strcmp(bnam->lname, val->name) ) { - ASN1_BIT_STRING_set_bit(bs, bnam->bitnum, 1); - break; - } - } - if(!bnam->lname) { - X509V3err(X509V3_F_V2I_ASN1_BIT_STRING,X509V3_R_UNKNOWN_BIT_STRING_ARGUMENT); - X509V3_conf_err(val); - ASN1_BIT_STRING_free(bs); - return NULL; - } - } - return bs; -} - -