Index: openssl/crypto/evp/evp_pkey.c |
diff --git a/openssl/crypto/evp/evp_pkey.c b/openssl/crypto/evp/evp_pkey.c |
deleted file mode 100644 |
index ceebf692848817601de5869af01f7e9a083cdf3f..0000000000000000000000000000000000000000 |
--- a/openssl/crypto/evp/evp_pkey.c |
+++ /dev/null |
@@ -1,242 +0,0 @@ |
-/* evp_pkey.c */ |
-/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
- * project 1999. |
- */ |
-/* ==================================================================== |
- * Copyright (c) 1999-2005 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 "cryptlib.h" |
-#include <openssl/x509.h> |
-#include <openssl/rand.h> |
-#include "asn1_locl.h" |
- |
-/* Extract a private key from a PKCS8 structure */ |
- |
-EVP_PKEY *EVP_PKCS82PKEY(PKCS8_PRIV_KEY_INFO *p8) |
-{ |
- EVP_PKEY *pkey = NULL; |
- ASN1_OBJECT *algoid; |
- char obj_tmp[80]; |
- |
- if (!PKCS8_pkey_get0(&algoid, NULL, NULL, NULL, p8)) |
- return NULL; |
- |
- if (!(pkey = EVP_PKEY_new())) { |
- EVPerr(EVP_F_EVP_PKCS82PKEY,ERR_R_MALLOC_FAILURE); |
- return NULL; |
- } |
- |
- if (!EVP_PKEY_set_type(pkey, OBJ_obj2nid(algoid))) |
- { |
- EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM); |
- i2t_ASN1_OBJECT(obj_tmp, 80, algoid); |
- ERR_add_error_data(2, "TYPE=", obj_tmp); |
- goto error; |
- } |
- |
- if (pkey->ameth->priv_decode) |
- { |
- if (!pkey->ameth->priv_decode(pkey, p8)) |
- { |
- EVPerr(EVP_F_EVP_PKCS82PKEY, |
- EVP_R_PRIVATE_KEY_DECODE_ERROR); |
- goto error; |
- } |
- } |
- else |
- { |
- EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_METHOD_NOT_SUPPORTED); |
- goto error; |
- } |
- |
- return pkey; |
- |
- error: |
- EVP_PKEY_free (pkey); |
- return NULL; |
-} |
- |
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey) |
-{ |
- return EVP_PKEY2PKCS8_broken(pkey, PKCS8_OK); |
-} |
- |
-/* Turn a private key into a PKCS8 structure */ |
- |
-PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8_broken(EVP_PKEY *pkey, int broken) |
-{ |
- PKCS8_PRIV_KEY_INFO *p8; |
- |
- if (!(p8 = PKCS8_PRIV_KEY_INFO_new())) { |
- EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN,ERR_R_MALLOC_FAILURE); |
- return NULL; |
- } |
- p8->broken = broken; |
- |
- if (pkey->ameth) |
- { |
- if (pkey->ameth->priv_encode) |
- { |
- if (!pkey->ameth->priv_encode(p8, pkey)) |
- { |
- EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, |
- EVP_R_PRIVATE_KEY_ENCODE_ERROR); |
- goto error; |
- } |
- } |
- else |
- { |
- EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, |
- EVP_R_METHOD_NOT_SUPPORTED); |
- goto error; |
- } |
- } |
- else |
- { |
- EVPerr(EVP_F_EVP_PKEY2PKCS8_BROKEN, |
- EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM); |
- goto error; |
- } |
- RAND_add(p8->pkey->value.octet_string->data, |
- p8->pkey->value.octet_string->length, 0.0); |
- return p8; |
- error: |
- PKCS8_PRIV_KEY_INFO_free(p8); |
- return NULL; |
-} |
- |
-PKCS8_PRIV_KEY_INFO *PKCS8_set_broken(PKCS8_PRIV_KEY_INFO *p8, int broken) |
-{ |
- switch (broken) { |
- |
- case PKCS8_OK: |
- p8->broken = PKCS8_OK; |
- return p8; |
- break; |
- |
- case PKCS8_NO_OCTET: |
- p8->broken = PKCS8_NO_OCTET; |
- p8->pkey->type = V_ASN1_SEQUENCE; |
- return p8; |
- break; |
- |
- default: |
- EVPerr(EVP_F_PKCS8_SET_BROKEN,EVP_R_PKCS8_UNKNOWN_BROKEN_TYPE); |
- return NULL; |
- } |
-} |
- |
-/* EVP_PKEY attribute functions */ |
- |
-int EVP_PKEY_get_attr_count(const EVP_PKEY *key) |
-{ |
- return X509at_get_attr_count(key->attributes); |
-} |
- |
-int EVP_PKEY_get_attr_by_NID(const EVP_PKEY *key, int nid, |
- int lastpos) |
-{ |
- return X509at_get_attr_by_NID(key->attributes, nid, lastpos); |
-} |
- |
-int EVP_PKEY_get_attr_by_OBJ(const EVP_PKEY *key, ASN1_OBJECT *obj, |
- int lastpos) |
-{ |
- return X509at_get_attr_by_OBJ(key->attributes, obj, lastpos); |
-} |
- |
-X509_ATTRIBUTE *EVP_PKEY_get_attr(const EVP_PKEY *key, int loc) |
-{ |
- return X509at_get_attr(key->attributes, loc); |
-} |
- |
-X509_ATTRIBUTE *EVP_PKEY_delete_attr(EVP_PKEY *key, int loc) |
-{ |
- return X509at_delete_attr(key->attributes, loc); |
-} |
- |
-int EVP_PKEY_add1_attr(EVP_PKEY *key, X509_ATTRIBUTE *attr) |
-{ |
- if(X509at_add1_attr(&key->attributes, attr)) return 1; |
- return 0; |
-} |
- |
-int EVP_PKEY_add1_attr_by_OBJ(EVP_PKEY *key, |
- const ASN1_OBJECT *obj, int type, |
- const unsigned char *bytes, int len) |
-{ |
- if(X509at_add1_attr_by_OBJ(&key->attributes, obj, |
- type, bytes, len)) return 1; |
- return 0; |
-} |
- |
-int EVP_PKEY_add1_attr_by_NID(EVP_PKEY *key, |
- int nid, int type, |
- const unsigned char *bytes, int len) |
-{ |
- if(X509at_add1_attr_by_NID(&key->attributes, nid, |
- type, bytes, len)) return 1; |
- return 0; |
-} |
- |
-int EVP_PKEY_add1_attr_by_txt(EVP_PKEY *key, |
- const char *attrname, int type, |
- const unsigned char *bytes, int len) |
-{ |
- if(X509at_add1_attr_by_txt(&key->attributes, attrname, |
- type, bytes, len)) return 1; |
- return 0; |
-} |