diff options
| author | cvs2svn <admin@example.com> | 2015-03-08 16:48:48 +0000 |
|---|---|---|
| committer | cvs2svn <admin@example.com> | 2015-03-08 16:48:48 +0000 |
| commit | da1a9ad3a4a867ba6569c05e6fca66d7f296c553 (patch) | |
| tree | 44872802e872bdfd60730fa9cf01d9d5751251c1 /src/lib/libcrypto/x509v3/v3_akey.c | |
| parent | 973703db67a8e73d70e63afa8f2cde19da09144d (diff) | |
| download | openbsd-OPENBSD_5_7_BASE.tar.gz openbsd-OPENBSD_5_7_BASE.tar.bz2 openbsd-OPENBSD_5_7_BASE.zip | |
This commit was manufactured by cvs2git to create tag 'OPENBSD_5_7_BASE'.OPENBSD_5_7_BASE
Diffstat (limited to 'src/lib/libcrypto/x509v3/v3_akey.c')
| -rw-r--r-- | src/lib/libcrypto/x509v3/v3_akey.c | 209 |
1 files changed, 0 insertions, 209 deletions
diff --git a/src/lib/libcrypto/x509v3/v3_akey.c b/src/lib/libcrypto/x509v3/v3_akey.c deleted file mode 100644 index d5b5f685af..0000000000 --- a/src/lib/libcrypto/x509v3/v3_akey.c +++ /dev/null | |||
| @@ -1,209 +0,0 @@ | |||
| 1 | /* $OpenBSD: v3_akey.c,v 1.13 2014/10/05 18:26:22 miod Exp $ */ | ||
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | ||
| 3 | * project 1999. | ||
| 4 | */ | ||
| 5 | /* ==================================================================== | ||
| 6 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | ||
| 7 | * | ||
| 8 | * Redistribution and use in source and binary forms, with or without | ||
| 9 | * modification, are permitted provided that the following conditions | ||
| 10 | * are met: | ||
| 11 | * | ||
| 12 | * 1. Redistributions of source code must retain the above copyright | ||
| 13 | * notice, this list of conditions and the following disclaimer. | ||
| 14 | * | ||
| 15 | * 2. Redistributions in binary form must reproduce the above copyright | ||
| 16 | * notice, this list of conditions and the following disclaimer in | ||
| 17 | * the documentation and/or other materials provided with the | ||
| 18 | * distribution. | ||
| 19 | * | ||
| 20 | * 3. All advertising materials mentioning features or use of this | ||
| 21 | * software must display the following acknowledgment: | ||
| 22 | * "This product includes software developed by the OpenSSL Project | ||
| 23 | * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" | ||
| 24 | * | ||
| 25 | * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to | ||
| 26 | * endorse or promote products derived from this software without | ||
| 27 | * prior written permission. For written permission, please contact | ||
| 28 | * licensing@OpenSSL.org. | ||
| 29 | * | ||
| 30 | * 5. Products derived from this software may not be called "OpenSSL" | ||
| 31 | * nor may "OpenSSL" appear in their names without prior written | ||
| 32 | * permission of the OpenSSL Project. | ||
| 33 | * | ||
| 34 | * 6. Redistributions of any form whatsoever must retain the following | ||
| 35 | * acknowledgment: | ||
| 36 | * "This product includes software developed by the OpenSSL Project | ||
| 37 | * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" | ||
| 38 | * | ||
| 39 | * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY | ||
| 40 | * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| 41 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||
| 42 | * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR | ||
| 43 | * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| 44 | * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
| 45 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| 46 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
| 47 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, | ||
| 48 | * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| 49 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | ||
| 50 | * OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| 51 | * ==================================================================== | ||
| 52 | * | ||
| 53 | * This product includes cryptographic software written by Eric Young | ||
| 54 | * (eay@cryptsoft.com). This product includes software written by Tim | ||
| 55 | * Hudson (tjh@cryptsoft.com). | ||
| 56 | * | ||
| 57 | */ | ||
| 58 | |||
| 59 | #include <stdio.h> | ||
| 60 | #include <string.h> | ||
| 61 | |||
| 62 | #include <openssl/asn1.h> | ||
| 63 | #include <openssl/asn1t.h> | ||
| 64 | #include <openssl/conf.h> | ||
| 65 | #include <openssl/err.h> | ||
| 66 | #include <openssl/x509v3.h> | ||
| 67 | |||
| 68 | static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
| 69 | AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist); | ||
| 70 | static AUTHORITY_KEYID *v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
| 71 | X509V3_CTX *ctx, STACK_OF(CONF_VALUE) *values); | ||
| 72 | |||
| 73 | const X509V3_EXT_METHOD v3_akey_id = { | ||
| 74 | NID_authority_key_identifier, | ||
| 75 | X509V3_EXT_MULTILINE, ASN1_ITEM_ref(AUTHORITY_KEYID), | ||
| 76 | 0, 0,0, 0, | ||
| 77 | 0, 0, | ||
| 78 | (X509V3_EXT_I2V)i2v_AUTHORITY_KEYID, | ||
| 79 | (X509V3_EXT_V2I)v2i_AUTHORITY_KEYID, | ||
| 80 | 0, 0, | ||
| 81 | NULL | ||
| 82 | }; | ||
| 83 | |||
| 84 | static | ||
| 85 | STACK_OF(CONF_VALUE) *i2v_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, | ||
| 86 | AUTHORITY_KEYID *akeyid, STACK_OF(CONF_VALUE) *extlist) | ||
| 87 | { | ||
| 88 | char *tmp; | ||
| 89 | |||
| 90 | if (akeyid->keyid) { | ||
| 91 | tmp = hex_to_string(akeyid->keyid->data, akeyid->keyid->length); | ||
| 92 | X509V3_add_value("keyid", tmp, &extlist); | ||
| 93 | free(tmp); | ||
| 94 | } | ||
| 95 | if (akeyid->issuer) | ||
| 96 | extlist = i2v_GENERAL_NAMES(NULL, akeyid->issuer, extlist); | ||
| 97 | if (akeyid->serial) { | ||
| 98 | tmp = hex_to_string(akeyid->serial->data, | ||
| 99 | akeyid->serial->length); | ||
| 100 | X509V3_add_value("serial", tmp, &extlist); | ||
| 101 | free(tmp); | ||
| 102 | } | ||
| 103 | return extlist; | ||
| 104 | } | ||
| 105 | |||
| 106 | /* Currently two options: | ||
| 107 | * keyid: use the issuers subject keyid, the value 'always' means its is | ||
| 108 | * an error if the issuer certificate doesn't have a key id. | ||
| 109 | * issuer: use the issuers cert issuer and serial number. The default is | ||
| 110 | * to only use this if keyid is not present. With the option 'always' | ||
| 111 | * this is always included. | ||
| 112 | */ | ||
| 113 | |||
| 114 | static AUTHORITY_KEYID * | ||
| 115 | v2i_AUTHORITY_KEYID(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, | ||
| 116 | STACK_OF(CONF_VALUE) *values) | ||
| 117 | { | ||
| 118 | char keyid = 0, issuer = 0; | ||
| 119 | int i; | ||
| 120 | CONF_VALUE *cnf; | ||
| 121 | ASN1_OCTET_STRING *ikeyid = NULL; | ||
| 122 | X509_NAME *isname = NULL; | ||
| 123 | STACK_OF(GENERAL_NAME) *gens = NULL; | ||
| 124 | GENERAL_NAME *gen = NULL; | ||
| 125 | ASN1_INTEGER *serial = NULL; | ||
| 126 | X509_EXTENSION *ext; | ||
| 127 | X509 *cert; | ||
| 128 | AUTHORITY_KEYID *akeyid = NULL; | ||
| 129 | |||
| 130 | for (i = 0; i < sk_CONF_VALUE_num(values); i++) { | ||
| 131 | cnf = sk_CONF_VALUE_value(values, i); | ||
| 132 | if (!strcmp(cnf->name, "keyid")) { | ||
| 133 | keyid = 1; | ||
| 134 | if (cnf->value && !strcmp(cnf->value, "always")) | ||
| 135 | keyid = 2; | ||
| 136 | } | ||
| 137 | else if (!strcmp(cnf->name, "issuer")) { | ||
| 138 | issuer = 1; | ||
| 139 | if (cnf->value && !strcmp(cnf->value, "always")) | ||
| 140 | issuer = 2; | ||
| 141 | } else { | ||
| 142 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, | ||
| 143 | X509V3_R_UNKNOWN_OPTION); | ||
| 144 | ERR_asprintf_error_data("name=%s", cnf->name); | ||
| 145 | return NULL; | ||
| 146 | } | ||
| 147 | } | ||
| 148 | |||
| 149 | if (!ctx || !ctx->issuer_cert) { | ||
| 150 | if (ctx && (ctx->flags == CTX_TEST)) | ||
| 151 | return AUTHORITY_KEYID_new(); | ||
| 152 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, | ||
| 153 | X509V3_R_NO_ISSUER_CERTIFICATE); | ||
| 154 | return NULL; | ||
| 155 | } | ||
| 156 | |||
| 157 | cert = ctx->issuer_cert; | ||
| 158 | |||
| 159 | if (keyid) { | ||
| 160 | i = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1); | ||
| 161 | if ((i >= 0) && (ext = X509_get_ext(cert, i))) | ||
| 162 | ikeyid = X509V3_EXT_d2i(ext); | ||
| 163 | if (keyid == 2 && !ikeyid) { | ||
| 164 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, | ||
| 165 | X509V3_R_UNABLE_TO_GET_ISSUER_KEYID); | ||
| 166 | return NULL; | ||
| 167 | } | ||
| 168 | } | ||
| 169 | |||
| 170 | if ((issuer && !ikeyid) || (issuer == 2)) { | ||
| 171 | isname = X509_NAME_dup(X509_get_issuer_name(cert)); | ||
| 172 | serial = M_ASN1_INTEGER_dup(X509_get_serialNumber(cert)); | ||
| 173 | if (!isname || !serial) { | ||
| 174 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, | ||
| 175 | X509V3_R_UNABLE_TO_GET_ISSUER_DETAILS); | ||
| 176 | goto err; | ||
| 177 | } | ||
| 178 | } | ||
| 179 | |||
| 180 | if (!(akeyid = AUTHORITY_KEYID_new())) | ||
| 181 | goto err; | ||
| 182 | |||
| 183 | if (isname) { | ||
| 184 | if (!(gens = sk_GENERAL_NAME_new_null()) || | ||
| 185 | !(gen = GENERAL_NAME_new()) || | ||
| 186 | !sk_GENERAL_NAME_push(gens, gen)) { | ||
| 187 | X509V3err(X509V3_F_V2I_AUTHORITY_KEYID, | ||
| 188 | ERR_R_MALLOC_FAILURE); | ||
| 189 | goto err; | ||
| 190 | } | ||
| 191 | gen->type = GEN_DIRNAME; | ||
| 192 | gen->d.dirn = isname; | ||
| 193 | } | ||
| 194 | |||
| 195 | akeyid->issuer = gens; | ||
| 196 | akeyid->serial = serial; | ||
| 197 | akeyid->keyid = ikeyid; | ||
| 198 | |||
| 199 | return akeyid; | ||
| 200 | |||
| 201 | err: | ||
| 202 | AUTHORITY_KEYID_free(akeyid); | ||
| 203 | GENERAL_NAME_free(gen); | ||
| 204 | sk_GENERAL_NAME_free(gens); | ||
| 205 | X509_NAME_free(isname); | ||
| 206 | M_ASN1_INTEGER_free(serial); | ||
| 207 | M_ASN1_OCTET_STRING_free(ikeyid); | ||
| 208 | return NULL; | ||
| 209 | } | ||
