Browse Source

Remove Ubsec engine

The ubsec engine is now considered obsolete and therefore has been
removed.

Reviewed-by: Rich Salz <rsalz@openssl.org>
master
Matt Caswell 6 years ago
parent
commit
766579ec89
8 changed files with 4 additions and 1424 deletions
  1. +1
    -1
      CHANGES
  2. +3
    -4
      README.ENGINE
  3. +0
    -5
      engines/Makefile.in
  4. +0
    -1034
      engines/e_ubsec.c
  5. +0
    -1
      engines/e_ubsec.ec
  6. +0
    -153
      engines/e_ubsec_err.c
  7. +0
    -102
      engines/e_ubsec_err.h
  8. +0
    -124
      engines/vendor_defns/hw_ubsec.h

+ 1
- 1
CHANGES View File

@ -323,7 +323,7 @@
[Rich Salz]
*) Removed obsolete engines: 4758cca, aep, atalla, cswift, nuron, gmp,
and sureware.
sureware and ubsec.
[Matt Caswell, Rich Salz]
*) New ASN.1 embed macro.


+ 3
- 4
README.ENGINE View File

@ -13,11 +13,10 @@
There are currently built-in ENGINE implementations for the following
crypto devices:
o CryptoSwift
o Compaq Atalla
o Cryptodev
o Microsoft CryptoAPI
o VIA Padlock
o nCipher CHIL
o Nuron
o Broadcom uBSec
In addition, dynamic binding to external ENGINE implementations is now
provided by a special ENGINE called "dynamic". See the "DYNAMIC ENGINE"


+ 0
- 5
engines/Makefile.in View File

@ -2,9 +2,6 @@
# OpenSSL/engines/Makefile
#
#The following engines have been disabled as they currently do not build
# sureware ubsec
DIR= engines
TOP= ..
CC= cc
@ -43,8 +40,6 @@ TESTLIBOBJ= e_ossltest.o
SRC= $(LIBSRC)
HEADER= \
e_chil_err.c e_chil_err.h \
e_ubsec_err.c e_ubsec_err.h \
e_capi_err.c e_capi_err.h \
e_ossltest_err.c e_ossltest_err.h \
e_dasync_err.c e_dasync_err.h


+ 0
- 1034
engines/e_ubsec.c
File diff suppressed because it is too large
View File


+ 0
- 1
engines/e_ubsec.ec View File

@ -1 +0,0 @@
L UBSEC e_ubsec_err.h e_ubsec_err.c

+ 0
- 153
engines/e_ubsec_err.c View File

@ -1,153 +0,0 @@
/* ====================================================================
* 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
* openssl-core@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).
*
*/
/*
* NOTE: this file was auto generated by the mkerr.pl script: any changes
* made to it will be overwritten when the script next updates this file,
* only reason strings will be preserved.
*/
#include <stdio.h>
#include <openssl/err.h>
#include "e_ubsec_err.h"
/* BEGIN ERROR CODES */
#ifndef OPENSSL_NO_ERR
# define ERR_FUNC(func) ERR_PACK(0,func,0)
# define ERR_REASON(reason) ERR_PACK(0,0,reason)
static ERR_STRING_DATA UBSEC_str_functs[] = {
{ERR_FUNC(UBSEC_F_UBSEC_CTRL), "UBSEC_CTRL"},
{ERR_FUNC(UBSEC_F_UBSEC_DH_COMPUTE_KEY), "UBSEC_DH_COMPUTE_KEY"},
{ERR_FUNC(UBSEC_F_UBSEC_DH_GENERATE_KEY), "UBSEC_DH_GENERATE_KEY"},
{ERR_FUNC(UBSEC_F_UBSEC_DSA_DO_SIGN), "UBSEC_DSA_DO_SIGN"},
{ERR_FUNC(UBSEC_F_UBSEC_DSA_VERIFY), "UBSEC_DSA_VERIFY"},
{ERR_FUNC(UBSEC_F_UBSEC_FINISH), "UBSEC_FINISH"},
{ERR_FUNC(UBSEC_F_UBSEC_INIT), "UBSEC_INIT"},
{ERR_FUNC(UBSEC_F_UBSEC_MOD_EXP), "UBSEC_MOD_EXP"},
{ERR_FUNC(UBSEC_F_UBSEC_MOD_EXP_CRT), "UBSEC_MOD_EXP_CRT"},
{ERR_FUNC(UBSEC_F_UBSEC_RAND_BYTES), "UBSEC_RAND_BYTES"},
{ERR_FUNC(UBSEC_F_UBSEC_RSA_MOD_EXP), "UBSEC_RSA_MOD_EXP"},
{ERR_FUNC(UBSEC_F_UBSEC_RSA_MOD_EXP_CRT), "UBSEC_RSA_MOD_EXP_CRT"},
{0, NULL}
};
static ERR_STRING_DATA UBSEC_str_reasons[] = {
{ERR_REASON(UBSEC_R_ALREADY_LOADED), "already loaded"},
{ERR_REASON(UBSEC_R_BN_EXPAND_FAIL), "bn expand fail"},
{ERR_REASON(UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED),
"ctrl command not implemented"},
{ERR_REASON(UBSEC_R_DSO_FAILURE), "dso failure"},
{ERR_REASON(UBSEC_R_MISSING_KEY_COMPONENTS), "missing key components"},
{ERR_REASON(UBSEC_R_NOT_LOADED), "not loaded"},
{ERR_REASON(UBSEC_R_REQUEST_FAILED), "request failed"},
{ERR_REASON(UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL),
"size too large or too small"},
{ERR_REASON(UBSEC_R_UNIT_FAILURE), "unit failure"},
{0, NULL}
};
#endif
#ifdef UBSEC_LIB_NAME
static ERR_STRING_DATA UBSEC_lib_name[] = {
{0, UBSEC_LIB_NAME},
{0, NULL}
};
#endif
static int UBSEC_lib_error_code = 0;
static int UBSEC_error_init = 1;
static void ERR_load_UBSEC_strings(void)
{
if (UBSEC_lib_error_code == 0)
UBSEC_lib_error_code = ERR_get_next_error_library();
if (UBSEC_error_init) {
UBSEC_error_init = 0;
#ifndef OPENSSL_NO_ERR
ERR_load_strings(UBSEC_lib_error_code, UBSEC_str_functs);
ERR_load_strings(UBSEC_lib_error_code, UBSEC_str_reasons);
#endif
#ifdef UBSEC_LIB_NAME
UBSEC_lib_name->error = ERR_PACK(UBSEC_lib_error_code, 0, 0);
ERR_load_strings(0, UBSEC_lib_name);
#endif
}
}
static void ERR_unload_UBSEC_strings(void)
{
if (UBSEC_error_init == 0) {
#ifndef OPENSSL_NO_ERR
ERR_unload_strings(UBSEC_lib_error_code, UBSEC_str_functs);
ERR_unload_strings(UBSEC_lib_error_code, UBSEC_str_reasons);
#endif
#ifdef UBSEC_LIB_NAME
ERR_unload_strings(0, UBSEC_lib_name);
#endif
UBSEC_error_init = 1;
}
}
static void ERR_UBSEC_error(int function, int reason, char *file, int line)
{
if (UBSEC_lib_error_code == 0)
UBSEC_lib_error_code = ERR_get_next_error_library();
ERR_PUT_error(UBSEC_lib_error_code, function, reason, file, line);
}

+ 0
- 102
engines/e_ubsec_err.h View File

@ -1,102 +0,0 @@
/* ====================================================================
* Copyright (c) 2001 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
* openssl-core@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).
*
*/
#ifndef HEADER_UBSEC_ERR_H
# define HEADER_UBSEC_ERR_H
#ifdef __cplusplus
extern "C" {
#endif
/* BEGIN ERROR CODES */
/*
* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run.
*/
static void ERR_load_UBSEC_strings(void);
static void ERR_unload_UBSEC_strings(void);
static void ERR_UBSEC_error(int function, int reason, char *file, int line);
# define UBSECerr(f,r) ERR_UBSEC_error((f),(r),OPENSSL_FILE,OPENSSL_LINE)
/* Error codes for the UBSEC functions. */
/* Function codes. */
# define UBSEC_F_UBSEC_CTRL 100
# define UBSEC_F_UBSEC_DH_COMPUTE_KEY 101
# define UBSEC_F_UBSEC_DH_GENERATE_KEY 111
# define UBSEC_F_UBSEC_DSA_DO_SIGN 102
# define UBSEC_F_UBSEC_DSA_VERIFY 103
# define UBSEC_F_UBSEC_FINISH 104
# define UBSEC_F_UBSEC_INIT 105
# define UBSEC_F_UBSEC_MOD_EXP 106
# define UBSEC_F_UBSEC_MOD_EXP_CRT 110
# define UBSEC_F_UBSEC_RAND_BYTES 107
# define UBSEC_F_UBSEC_RSA_MOD_EXP 108
# define UBSEC_F_UBSEC_RSA_MOD_EXP_CRT 109
/* Reason codes. */
# define UBSEC_R_ALREADY_LOADED 100
# define UBSEC_R_BN_EXPAND_FAIL 101
# define UBSEC_R_CTRL_COMMAND_NOT_IMPLEMENTED 102
# define UBSEC_R_DSO_FAILURE 103
# define UBSEC_R_MISSING_KEY_COMPONENTS 104
# define UBSEC_R_NOT_LOADED 105
# define UBSEC_R_REQUEST_FAILED 106
# define UBSEC_R_SIZE_TOO_LARGE_OR_TOO_SMALL 107
# define UBSEC_R_UNIT_FAILURE 108
#ifdef __cplusplus
}
#endif
#endif

+ 0
- 124
engines/vendor_defns/hw_ubsec.h View File

@ -1,124 +0,0 @@
/******************************************************************************
*
* Copyright 2000
* Broadcom Corporation
* 16215 Alton Parkway
* PO Box 57013
* Irvine CA 92619-7013
*
*****************************************************************************/
/*
* Broadcom Corporation uBSec SDK
*/
/*
* Character device header file.
*/
/*
* Revision History:
*
* October 2000 JTT Created.
*/
#define MAX_PUBLIC_KEY_BITS (1024)
#define MAX_PUBLIC_KEY_BYTES (1024/8)
#define SHA_BIT_SIZE (160)
#define MAX_CRYPTO_KEY_LENGTH 24
#define MAX_MAC_KEY_LENGTH 64
#define UBSEC_CRYPTO_DEVICE_NAME ((unsigned char *)"/dev/ubscrypt")
#define UBSEC_KEY_DEVICE_NAME ((unsigned char *)"/dev/ubskey")
/* Math command types. */
#define UBSEC_MATH_MODADD 0x0001
#define UBSEC_MATH_MODSUB 0x0002
#define UBSEC_MATH_MODMUL 0x0004
#define UBSEC_MATH_MODEXP 0x0008
#define UBSEC_MATH_MODREM 0x0010
#define UBSEC_MATH_MODINV 0x0020
typedef long ubsec_MathCommand_t;
typedef long ubsec_RNGCommand_t;
typedef struct ubsec_crypto_context_s {
unsigned int flags;
unsigned char crypto[MAX_CRYPTO_KEY_LENGTH];
unsigned char auth[MAX_MAC_KEY_LENGTH];
} ubsec_crypto_context_t, *ubsec_crypto_context_p;
/*
* Predeclare the function pointer types that we dynamically load from the DSO.
*/
typedef int t_UBSEC_ubsec_bytes_to_bits(unsigned char *n, int bytes);
typedef int t_UBSEC_ubsec_bits_to_bytes(int bits);
typedef int t_UBSEC_ubsec_open(unsigned char *device);
typedef int t_UBSEC_ubsec_close(int fd);
typedef int t_UBSEC_diffie_hellman_generate_ioctl(int fd,
unsigned char *x,
int *x_len,
unsigned char *y,
int *y_len,
unsigned char *g, int g_len,
unsigned char *m, int m_len,
unsigned char *userX,
int userX_len,
int random_bits);
typedef int t_UBSEC_diffie_hellman_agree_ioctl(int fd,
unsigned char *x, int x_len,
unsigned char *y, int y_len,
unsigned char *m, int m_len,
unsigned char *k, int *k_len);
typedef int t_UBSEC_rsa_mod_exp_ioctl(int fd,
unsigned char *x, int x_len,
unsigned char *m, int m_len,
unsigned char *e, int e_len,
unsigned char *y, int *y_len);
typedef int t_UBSEC_rsa_mod_exp_crt_ioctl(int fd,
unsigned char *x, int x_len,
unsigned char *qinv, int qinv_len,
unsigned char *edq, int edq_len,
unsigned char *q, int q_len,
unsigned char *edp, int edp_len,
unsigned char *p, int p_len,
unsigned char *y, int *y_len);
typedef int t_UBSEC_dsa_sign_ioctl(int fd,
int hash, unsigned char *data,
int data_len, unsigned char *rndom,
int random_len, unsigned char *p,
int p_len, unsigned char *q, int q_len,
unsigned char *g, int g_len,
unsigned char *key, int key_len,
unsigned char *r, int *r_len,
unsigned char *s, int *s_len);
typedef int t_UBSEC_dsa_verify_ioctl(int fd,
int hash, unsigned char *data,
int data_len, unsigned char *p,
int p_len, unsigned char *q, int q_len,
unsigned char *g, int g_len,
unsigned char *key, int key_len,
unsigned char *r, int r_len,
unsigned char *s, int s_len,
unsigned char *v, int *v_len);
typedef int t_UBSEC_math_accelerate_ioctl(int fd, ubsec_MathCommand_t command,
unsigned char *ModN, int *ModN_len,
unsigned char *ExpE, int *ExpE_len,
unsigned char *ParamA,
int *ParamA_len,
unsigned char *ParamB,
int *ParamB_len,
unsigned char *Result,
int *Result_len);
typedef int t_UBSEC_rng_ioctl(int fd, ubsec_RNGCommand_t command,
unsigned char *Result, int *Result_len);
typedef int t_UBSEC_max_key_len_ioctl(int fd, int *max_key_len);

Loading…
Cancel
Save