yggdrasil/ring
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove GFp/err.h and clean up leftover unused bits.

Browse Source
This commit is contained in:
Brian Smith 2017-04-27 16:06:22 -10:00
parent d5d285177f
commit 60867f2642
11 changed files with 0 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -224,7 +224,6 @@ include = [
"include/GFp/base.h", "include/GFp/base.h",
"include/GFp/bn.h", "include/GFp/bn.h",
"include/GFp/cpu.h", "include/GFp/cpu.h",
"include/GFp/err.h",
"include/GFp/mem.h", "include/GFp/mem.h",
"include/GFp/type_check.h", "include/GFp/type_check.h",
"examples/checkdigest.rs", "examples/checkdigest.rs",

1
build.rs
View File

@ -184,7 +184,6 @@ const RING_INCLUDES: &'static [&'static str] =
"include/GFp/base.h", "include/GFp/base.h",
"include/GFp/bn.h", "include/GFp/bn.h",
"include/GFp/cpu.h", "include/GFp/cpu.h",
"include/GFp/err.h",
"include/GFp/mem.h", "include/GFp/mem.h",
"include/GFp/type_check.h"]; "include/GFp/type_check.h"];

4
crypto/bn/bn.c
View File

@ -59,7 +59,6 @@
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <GFp/err.h>
#include <GFp/mem.h> #include <GFp/mem.h>
#include "internal.h" #include "internal.h"
@ -117,18 +116,15 @@ int GFp_bn_wexpand(BIGNUM *bn, size_t words) {
} }
if (words > (INT_MAX / (4 * BN_BITS2))) { if (words > (INT_MAX / (4 * BN_BITS2))) {
OPENSSL_PUT_ERROR(BN, BN_R_BIGNUM_TOO_LONG);
return 0; return 0;
} }
if (bn->flags & BN_FLG_STATIC_DATA) { if (bn->flags & BN_FLG_STATIC_DATA) {
OPENSSL_PUT_ERROR(BN, BN_R_EXPAND_ON_STATIC_BIGNUM_DATA);
return 0; return 0;
} }
a = OPENSSL_malloc(sizeof(BN_ULONG) * words); a = OPENSSL_malloc(sizeof(BN_ULONG) * words);
if (a == NULL) { if (a == NULL) {
OPENSSL_PUT_ERROR(BN, ERR_R_MALLOC_FAILURE);
return 0; return 0;
} }

2
crypto/bn/exponentiation.c
View File

@ -112,8 +112,6 @@
#include <limits.h> #include <limits.h>
#include <string.h> #include <string.h>
#include <GFp/cpu.h>
#include <GFp/err.h>
#include <GFp/mem.h> #include <GFp/mem.h>
#include "internal.h" #include "internal.h"

1
crypto/bn/montgomery.c
View File

@ -111,7 +111,6 @@
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>
#include <GFp/err.h>
#include <GFp/mem.h> #include <GFp/mem.h>
#include <GFp/type_check.h> #include <GFp/type_check.h>

1
crypto/cipher/e_aes.c
View File

@ -50,7 +50,6 @@
#include <GFp/aes.h> #include <GFp/aes.h>
#include <GFp/cpu.h> #include <GFp/cpu.h>
#include <GFp/err.h>
#include <GFp/mem.h> #include <GFp/mem.h>
#include "internal.h" #include "internal.h"

2
crypto/cipher/internal.h
View File

@ -66,8 +66,6 @@
#include <assert.h> #include <assert.h>
#include <stdint.h> #include <stdint.h>
#include <GFp/err.h>
#include "../internal.h" #include "../internal.h"
#if defined(__cplusplus) #if defined(__cplusplus)

1
crypto/ec/ecp_nistz256.c
View File

@ -28,7 +28,6 @@
#include <string.h> #include <string.h>
#include <GFp/bn.h> #include <GFp/bn.h>
#include <GFp/err.h>
#include "ecp_nistz.h" #include "ecp_nistz.h"
#include "../limbs/limbs.h" #include "../limbs/limbs.h"

2
include/GFp/base.h
View File

@ -114,8 +114,6 @@ extern "C" {
typedef struct bignum_st BIGNUM; typedef struct bignum_st BIGNUM;
typedef struct RAND RAND;
#if defined(__cplusplus) #if defined(__cplusplus)
} /* extern C */ } /* extern C */

5
include/GFp/bn.h
View File

@ -125,8 +125,6 @@
#include <GFp/base.h> #include <GFp/base.h>
#include <inttypes.h> /* for PRIu64 and friends */
#if defined(__cplusplus) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
@ -255,7 +253,4 @@ struct bignum_st {
} /* extern C */ } /* extern C */
#endif #endif
#define BN_R_BIGNUM_TOO_LONG 102
#define BN_R_EXPAND_ON_STATIC_BIGNUM_DATA 106
#endif /* OPENSSL_HEADER_BN_H */ #endif /* OPENSSL_HEADER_BN_H */

140
include/GFp/err.h
View File

@ -1,140 +0,0 @@
/* 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.]
*/
/* ====================================================================
* Copyright (c) 1998-2006 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 OPENSSL_HEADER_ERR_H
#define OPENSSL_HEADER_ERR_H
#include <GFp/base.h>
#if defined(__cplusplus)
extern "C" {
#endif
/* Error queue handling functions.
*
* ring: No error state is maintained. The calls to |OPENSSL_PUT_ERROR| are
* retained in the code to help with keeping *ring* in sync with upstream, but
* they do nothing. All the functions and macros to read the error state have
* been removed. */
/* Private functions. */
#define OPENSSL_PUT_ERROR(library, reason)
/* Global reasons. */
#define ERR_R_FATAL 64
#define ERR_R_MALLOC_FAILURE (1 | ERR_R_FATAL)
#if defined(__cplusplus)
} /* extern C */
#endif
#endif /* OPENSSL_HEADER_ERR_H */