| Index: openssl/crypto/evp/names.c
|
| diff --git a/openssl/crypto/evp/names.c b/openssl/crypto/evp/names.c
|
| deleted file mode 100644
|
| index 6311ad7cfb77aed5bd4ce239fea46ea3ae290e01..0000000000000000000000000000000000000000
|
| --- a/openssl/crypto/evp/names.c
|
| +++ /dev/null
|
| @@ -1,206 +0,0 @@
|
| -/* crypto/evp/names.c */
|
| -/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
| - * All rights reserved.
|
| - *
|
| - * This package is an SSL implementation written
|
| - * by Eric Young (eay@cryptsoft.com).
|
| - * The implementation was written so as to conform with Netscapes SSL.
|
| - *
|
| - * This library is free for commercial and non-commercial use as long as
|
| - * the following conditions are aheared to. The following conditions
|
| - * apply to all code found in this distribution, be it the RC4, RSA,
|
| - * lhash, DES, etc., code; not just the SSL code. The SSL documentation
|
| - * included with this distribution is covered by the same copyright terms
|
| - * except that the holder is Tim Hudson (tjh@cryptsoft.com).
|
| - *
|
| - * Copyright remains Eric Young's, and as such any Copyright notices in
|
| - * the code are not to be removed.
|
| - * If this package is used in a product, Eric Young should be given attribution
|
| - * as the author of the parts of the library used.
|
| - * This can be in the form of a textual message at program startup or
|
| - * in documentation (online or textual) provided with the package.
|
| - *
|
| - * 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 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 acknowledgement:
|
| - * "This product includes cryptographic software written by
|
| - * Eric Young (eay@cryptsoft.com)"
|
| - * The word 'cryptographic' can be left out if the rouines from the library
|
| - * being used are not cryptographic related :-).
|
| - * 4. If you include any Windows specific code (or a derivative thereof) from
|
| - * the apps directory (application code) you must include an acknowledgement:
|
| - * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
|
| - * ANY EXPRESS 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 AUTHOR OR 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.
|
| - *
|
| - * The licence and distribution terms for any publically available version or
|
| - * derivative of this code cannot be changed. i.e. this code cannot simply be
|
| - * copied and put under another distribution licence
|
| - * [including the GNU Public Licence.]
|
| - */
|
| -
|
| -#include <stdio.h>
|
| -#include "cryptlib.h"
|
| -#include <openssl/evp.h>
|
| -#include <openssl/objects.h>
|
| -#include <openssl/x509.h>
|
| -
|
| -int EVP_add_cipher(const EVP_CIPHER *c)
|
| - {
|
| - int r;
|
| -
|
| - if (c == NULL) return 0;
|
| -
|
| - OPENSSL_init();
|
| -
|
| - r=OBJ_NAME_add(OBJ_nid2sn(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
|
| - if (r == 0) return(0);
|
| - check_defer(c->nid);
|
| - r=OBJ_NAME_add(OBJ_nid2ln(c->nid),OBJ_NAME_TYPE_CIPHER_METH,(const char *)c);
|
| - return(r);
|
| - }
|
| -
|
| -
|
| -int EVP_add_digest(const EVP_MD *md)
|
| - {
|
| - int r;
|
| - const char *name;
|
| - OPENSSL_init();
|
| -
|
| - name=OBJ_nid2sn(md->type);
|
| - r=OBJ_NAME_add(name,OBJ_NAME_TYPE_MD_METH,(const char *)md);
|
| - if (r == 0) return(0);
|
| - check_defer(md->type);
|
| - r=OBJ_NAME_add(OBJ_nid2ln(md->type),OBJ_NAME_TYPE_MD_METH,(const char *)md);
|
| - if (r == 0) return(0);
|
| -
|
| - if (md->pkey_type && md->type != md->pkey_type)
|
| - {
|
| - r=OBJ_NAME_add(OBJ_nid2sn(md->pkey_type),
|
| - OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
|
| - if (r == 0) return(0);
|
| - check_defer(md->pkey_type);
|
| - r=OBJ_NAME_add(OBJ_nid2ln(md->pkey_type),
|
| - OBJ_NAME_TYPE_MD_METH|OBJ_NAME_ALIAS,name);
|
| - }
|
| - return(r);
|
| - }
|
| -
|
| -const EVP_CIPHER *EVP_get_cipherbyname(const char *name)
|
| - {
|
| - const EVP_CIPHER *cp;
|
| -
|
| - cp=(const EVP_CIPHER *)OBJ_NAME_get(name,OBJ_NAME_TYPE_CIPHER_METH);
|
| - return(cp);
|
| - }
|
| -
|
| -const EVP_MD *EVP_get_digestbyname(const char *name)
|
| - {
|
| - const EVP_MD *cp;
|
| -
|
| - cp=(const EVP_MD *)OBJ_NAME_get(name,OBJ_NAME_TYPE_MD_METH);
|
| - return(cp);
|
| - }
|
| -
|
| -void EVP_cleanup(void)
|
| - {
|
| - OBJ_NAME_cleanup(OBJ_NAME_TYPE_CIPHER_METH);
|
| - OBJ_NAME_cleanup(OBJ_NAME_TYPE_MD_METH);
|
| - /* The above calls will only clean out the contents of the name
|
| - hash table, but not the hash table itself. The following line
|
| - does that part. -- Richard Levitte */
|
| - OBJ_NAME_cleanup(-1);
|
| -
|
| - EVP_PBE_cleanup();
|
| - if (obj_cleanup_defer == 2)
|
| - {
|
| - obj_cleanup_defer = 0;
|
| - OBJ_cleanup();
|
| - }
|
| - OBJ_sigid_free();
|
| - }
|
| -
|
| -struct doall_cipher
|
| - {
|
| - void *arg;
|
| - void (*fn)(const EVP_CIPHER *ciph,
|
| - const char *from, const char *to, void *arg);
|
| - };
|
| -
|
| -static void do_all_cipher_fn(const OBJ_NAME *nm, void *arg)
|
| - {
|
| - struct doall_cipher *dc = arg;
|
| - if (nm->alias)
|
| - dc->fn(NULL, nm->name, nm->data, dc->arg);
|
| - else
|
| - dc->fn((const EVP_CIPHER *)nm->data, nm->name, NULL, dc->arg);
|
| - }
|
| -
|
| -void EVP_CIPHER_do_all(void (*fn)(const EVP_CIPHER *ciph,
|
| - const char *from, const char *to, void *x), void *arg)
|
| - {
|
| - struct doall_cipher dc;
|
| - dc.fn = fn;
|
| - dc.arg = arg;
|
| - OBJ_NAME_do_all(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn, &dc);
|
| - }
|
| -
|
| -void EVP_CIPHER_do_all_sorted(void (*fn)(const EVP_CIPHER *ciph,
|
| - const char *from, const char *to, void *x), void *arg)
|
| - {
|
| - struct doall_cipher dc;
|
| - dc.fn = fn;
|
| - dc.arg = arg;
|
| - OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH, do_all_cipher_fn,&dc);
|
| - }
|
| -
|
| -struct doall_md
|
| - {
|
| - void *arg;
|
| - void (*fn)(const EVP_MD *ciph,
|
| - const char *from, const char *to, void *arg);
|
| - };
|
| -
|
| -static void do_all_md_fn(const OBJ_NAME *nm, void *arg)
|
| - {
|
| - struct doall_md *dc = arg;
|
| - if (nm->alias)
|
| - dc->fn(NULL, nm->name, nm->data, dc->arg);
|
| - else
|
| - dc->fn((const EVP_MD *)nm->data, nm->name, NULL, dc->arg);
|
| - }
|
| -
|
| -void EVP_MD_do_all(void (*fn)(const EVP_MD *md,
|
| - const char *from, const char *to, void *x), void *arg)
|
| - {
|
| - struct doall_md dc;
|
| - dc.fn = fn;
|
| - dc.arg = arg;
|
| - OBJ_NAME_do_all(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
|
| - }
|
| -
|
| -void EVP_MD_do_all_sorted(void (*fn)(const EVP_MD *md,
|
| - const char *from, const char *to, void *x), void *arg)
|
| - {
|
| - struct doall_md dc;
|
| - dc.fn = fn;
|
| - dc.arg = arg;
|
| - OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_MD_METH, do_all_md_fn, &dc);
|
| - }
|
|
|