Loading CHANGES +20 −0 Original line number Original line Diff line number Diff line Loading @@ -4,6 +4,26 @@ Changes between 0.9.4 and 0.9.5 [xx XXX 1999] Changes between 0.9.4 and 0.9.5 [xx XXX 1999] *) Modify the way the V3 extension code looks up extensions. This now works in a similar way to the object code: we have some "standard" extensions in a static table which is searched with OBJ_bsearch() and the application can add dynamic ones if needed. The file crypto/x509v3/ext_dat.h now has the info: this file needs to be updated whenever a new extension is added to the core code and kept in ext_nid order. There is a simple program 'tabtest.c' which checks this. New extensions are not added too often so this file can readily be maintained manually. There are two big advantages in doing things this way. The extensions can be looked up immediately and no longer need to be "added" using X509V3_add_standard_extensions(): this function now does nothing. [Side note: I get *lots* of email saying the extension code doesn't work because people forget to call this function] Also no dynamic allocation is done unless new extensions are added: so if we don't add custom extensions there is no need to call X509V3_EXT_cleanup(). [Steve Henson] *) Modify enc utility's salting as follows: make salting the default. Add a *) Modify enc utility's salting as follows: make salting the default. Add a magic header, so unsalted files fail gracefully instead of just decrypting magic header, so unsalted files fail gracefully instead of just decrypting to garbage. This is because not salting is a big security hole, so people to garbage. This is because not salting is a big security hole, so people Loading apps/ca.c +0 −3 Original line number Original line Diff line number Diff line Loading @@ -279,8 +279,6 @@ EF_ALIGNMENT=0; key = NULL; key = NULL; section = NULL; section = NULL; X509V3_add_standard_extensions(); preserve=0; preserve=0; msie_hack=0; msie_hack=0; if (bio_err == NULL) if (bio_err == NULL) Loading Loading @@ -1239,7 +1237,6 @@ err: X509_free(x509); X509_free(x509); X509_CRL_free(crl); X509_CRL_free(crl); CONF_free(conf); CONF_free(conf); X509V3_EXT_cleanup(); OBJ_cleanup(); OBJ_cleanup(); EXIT(ret); EXIT(ret); } } Loading apps/crl.c +0 −2 Original line number Original line Diff line number Diff line Loading @@ -200,7 +200,6 @@ bad: } } ERR_load_crypto_strings(); ERR_load_crypto_strings(); X509V3_add_standard_extensions(); x=load_crl(infile,informat); x=load_crl(infile,informat); if (x == NULL) { goto end; } if (x == NULL) { goto end; } Loading Loading @@ -318,7 +317,6 @@ end: X509_STORE_CTX_cleanup(&ctx); X509_STORE_CTX_cleanup(&ctx); X509_STORE_free(store); X509_STORE_free(store); } } X509V3_EXT_cleanup(); EXIT(ret); EXIT(ret); } } Loading apps/req.c +0 −2 Original line number Original line Diff line number Diff line Loading @@ -365,7 +365,6 @@ bad: } } ERR_load_crypto_strings(); ERR_load_crypto_strings(); X509V3_add_standard_extensions(); #ifndef MONOLITH #ifndef MONOLITH /* Lets load up our environment a little */ /* Lets load up our environment a little */ Loading Loading @@ -843,7 +842,6 @@ end: EVP_PKEY_free(pkey); EVP_PKEY_free(pkey); X509_REQ_free(req); X509_REQ_free(req); X509_free(x509ss); X509_free(x509ss); X509V3_EXT_cleanup(); OBJ_cleanup(); OBJ_cleanup(); ASN1_STRING_TABLE_cleanup(); ASN1_STRING_TABLE_cleanup(); #ifndef NO_DSA #ifndef NO_DSA Loading crypto/x509v3/ext_dat.h 0 → 100644 +97 −0 Original line number Original line Diff line number Diff line /* ext_dat.h */ /* 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). * */ /* This file contains a table of "standard" extensions */ 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; /* This table will be searched using OBJ_bsearch so it *must* kept in * order of the ext_nid values. */ static X509V3_EXT_METHOD *standard_exts[] = { &v3_nscert, &v3_ns_ia5_list[0], &v3_ns_ia5_list[1], &v3_ns_ia5_list[2], &v3_ns_ia5_list[3], &v3_ns_ia5_list[4], &v3_ns_ia5_list[5], &v3_ns_ia5_list[6], &v3_skey_id, &v3_key_usage, &v3_pkey_usage_period, &v3_alt[0], &v3_alt[1], &v3_bcons, &v3_crl_num, &v3_cpols, &v3_akey_id, &v3_crld, &v3_ext_ku, &v3_crl_reason, &v3_sxnet, &v3_info, }; /* Number of standard extensions: keep up to date */ #define STANDARD_EXTENSION_COUNT 22 Loading
CHANGES +20 −0 Original line number Original line Diff line number Diff line Loading @@ -4,6 +4,26 @@ Changes between 0.9.4 and 0.9.5 [xx XXX 1999] Changes between 0.9.4 and 0.9.5 [xx XXX 1999] *) Modify the way the V3 extension code looks up extensions. This now works in a similar way to the object code: we have some "standard" extensions in a static table which is searched with OBJ_bsearch() and the application can add dynamic ones if needed. The file crypto/x509v3/ext_dat.h now has the info: this file needs to be updated whenever a new extension is added to the core code and kept in ext_nid order. There is a simple program 'tabtest.c' which checks this. New extensions are not added too often so this file can readily be maintained manually. There are two big advantages in doing things this way. The extensions can be looked up immediately and no longer need to be "added" using X509V3_add_standard_extensions(): this function now does nothing. [Side note: I get *lots* of email saying the extension code doesn't work because people forget to call this function] Also no dynamic allocation is done unless new extensions are added: so if we don't add custom extensions there is no need to call X509V3_EXT_cleanup(). [Steve Henson] *) Modify enc utility's salting as follows: make salting the default. Add a *) Modify enc utility's salting as follows: make salting the default. Add a magic header, so unsalted files fail gracefully instead of just decrypting magic header, so unsalted files fail gracefully instead of just decrypting to garbage. This is because not salting is a big security hole, so people to garbage. This is because not salting is a big security hole, so people Loading
apps/ca.c +0 −3 Original line number Original line Diff line number Diff line Loading @@ -279,8 +279,6 @@ EF_ALIGNMENT=0; key = NULL; key = NULL; section = NULL; section = NULL; X509V3_add_standard_extensions(); preserve=0; preserve=0; msie_hack=0; msie_hack=0; if (bio_err == NULL) if (bio_err == NULL) Loading Loading @@ -1239,7 +1237,6 @@ err: X509_free(x509); X509_free(x509); X509_CRL_free(crl); X509_CRL_free(crl); CONF_free(conf); CONF_free(conf); X509V3_EXT_cleanup(); OBJ_cleanup(); OBJ_cleanup(); EXIT(ret); EXIT(ret); } } Loading
apps/crl.c +0 −2 Original line number Original line Diff line number Diff line Loading @@ -200,7 +200,6 @@ bad: } } ERR_load_crypto_strings(); ERR_load_crypto_strings(); X509V3_add_standard_extensions(); x=load_crl(infile,informat); x=load_crl(infile,informat); if (x == NULL) { goto end; } if (x == NULL) { goto end; } Loading Loading @@ -318,7 +317,6 @@ end: X509_STORE_CTX_cleanup(&ctx); X509_STORE_CTX_cleanup(&ctx); X509_STORE_free(store); X509_STORE_free(store); } } X509V3_EXT_cleanup(); EXIT(ret); EXIT(ret); } } Loading
apps/req.c +0 −2 Original line number Original line Diff line number Diff line Loading @@ -365,7 +365,6 @@ bad: } } ERR_load_crypto_strings(); ERR_load_crypto_strings(); X509V3_add_standard_extensions(); #ifndef MONOLITH #ifndef MONOLITH /* Lets load up our environment a little */ /* Lets load up our environment a little */ Loading Loading @@ -843,7 +842,6 @@ end: EVP_PKEY_free(pkey); EVP_PKEY_free(pkey); X509_REQ_free(req); X509_REQ_free(req); X509_free(x509ss); X509_free(x509ss); X509V3_EXT_cleanup(); OBJ_cleanup(); OBJ_cleanup(); ASN1_STRING_TABLE_cleanup(); ASN1_STRING_TABLE_cleanup(); #ifndef NO_DSA #ifndef NO_DSA Loading
crypto/x509v3/ext_dat.h 0 → 100644 +97 −0 Original line number Original line Diff line number Diff line /* ext_dat.h */ /* 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). * */ /* This file contains a table of "standard" extensions */ 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; /* This table will be searched using OBJ_bsearch so it *must* kept in * order of the ext_nid values. */ static X509V3_EXT_METHOD *standard_exts[] = { &v3_nscert, &v3_ns_ia5_list[0], &v3_ns_ia5_list[1], &v3_ns_ia5_list[2], &v3_ns_ia5_list[3], &v3_ns_ia5_list[4], &v3_ns_ia5_list[5], &v3_ns_ia5_list[6], &v3_skey_id, &v3_key_usage, &v3_pkey_usage_period, &v3_alt[0], &v3_alt[1], &v3_bcons, &v3_crl_num, &v3_cpols, &v3_akey_id, &v3_crld, &v3_ext_ku, &v3_crl_reason, &v3_sxnet, &v3_info, }; /* Number of standard extensions: keep up to date */ #define STANDARD_EXTENSION_COUNT 22
