Index: openssl/crypto/x509v3/v3_skey.c |
diff --git a/openssl/crypto/x509v3/v3_skey.c b/openssl/crypto/x509v3/v3_skey.c |
deleted file mode 100644 |
index 0a984fbaa8728a144ff4c86a8ea5925c5aeb5e38..0000000000000000000000000000000000000000 |
--- a/openssl/crypto/x509v3/v3_skey.c |
+++ /dev/null |
@@ -1,145 +0,0 @@ |
-/* v3_skey.c */ |
-/* Written by Dr Stephen N Henson (steve@openssl.org) 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/x509v3.h> |
- |
-static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, char *str); |
-const X509V3_EXT_METHOD v3_skey_id = { |
-NID_subject_key_identifier, 0, ASN1_ITEM_ref(ASN1_OCTET_STRING), |
-0,0,0,0, |
-(X509V3_EXT_I2S)i2s_ASN1_OCTET_STRING, |
-(X509V3_EXT_S2I)s2i_skey_id, |
-0,0,0,0, |
-NULL}; |
- |
-char *i2s_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, |
- ASN1_OCTET_STRING *oct) |
-{ |
- return hex_to_string(oct->data, oct->length); |
-} |
- |
-ASN1_OCTET_STRING *s2i_ASN1_OCTET_STRING(X509V3_EXT_METHOD *method, |
- X509V3_CTX *ctx, char *str) |
-{ |
- ASN1_OCTET_STRING *oct; |
- long length; |
- |
- if(!(oct = M_ASN1_OCTET_STRING_new())) { |
- X509V3err(X509V3_F_S2I_ASN1_OCTET_STRING,ERR_R_MALLOC_FAILURE); |
- return NULL; |
- } |
- |
- if(!(oct->data = string_to_hex(str, &length))) { |
- M_ASN1_OCTET_STRING_free(oct); |
- return NULL; |
- } |
- |
- oct->length = length; |
- |
- return oct; |
- |
-} |
- |
-static ASN1_OCTET_STRING *s2i_skey_id(X509V3_EXT_METHOD *method, |
- X509V3_CTX *ctx, char *str) |
-{ |
- ASN1_OCTET_STRING *oct; |
- ASN1_BIT_STRING *pk; |
- unsigned char pkey_dig[EVP_MAX_MD_SIZE]; |
- unsigned int diglen; |
- |
- if(strcmp(str, "hash")) return s2i_ASN1_OCTET_STRING(method, ctx, str); |
- |
- if(!(oct = M_ASN1_OCTET_STRING_new())) { |
- X509V3err(X509V3_F_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE); |
- return NULL; |
- } |
- |
- if(ctx && (ctx->flags == CTX_TEST)) return oct; |
- |
- if(!ctx || (!ctx->subject_req && !ctx->subject_cert)) { |
- X509V3err(X509V3_F_S2I_SKEY_ID,X509V3_R_NO_PUBLIC_KEY); |
- goto err; |
- } |
- |
- if(ctx->subject_req) |
- pk = ctx->subject_req->req_info->pubkey->public_key; |
- else pk = ctx->subject_cert->cert_info->key->public_key; |
- |
- if(!pk) { |
- X509V3err(X509V3_F_S2I_SKEY_ID,X509V3_R_NO_PUBLIC_KEY); |
- goto err; |
- } |
- |
- if (!EVP_Digest(pk->data, pk->length, pkey_dig, &diglen, EVP_sha1(), NULL)) |
- goto err; |
- |
- if(!M_ASN1_OCTET_STRING_set(oct, pkey_dig, diglen)) { |
- X509V3err(X509V3_F_S2I_SKEY_ID,ERR_R_MALLOC_FAILURE); |
- goto err; |
- } |
- |
- return oct; |
- |
- err: |
- M_ASN1_OCTET_STRING_free(oct); |
- return NULL; |
-} |