diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libcrypto/Makefile | 3 | ||||
| -rw-r--r-- | lib/libcrypto/rsa/rsa_crpt.c | 127 | ||||
| -rw-r--r-- | lib/libcrypto/rsa/rsa_eay.c | 55 |
3 files changed, 55 insertions, 130 deletions
diff --git a/lib/libcrypto/Makefile b/lib/libcrypto/Makefile index a0d60b25fb0..2040428cef3 100644 --- a/lib/libcrypto/Makefile +++ b/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.154 2023/08/09 09:23:03 tb Exp $ +# $OpenBSD: Makefile,v 1.155 2023/08/09 09:32:22 tb Exp $ LIB= crypto LIBREBUILD=y @@ -535,7 +535,6 @@ SRCS+= rsa_ameth.c SRCS+= rsa_asn1.c SRCS+= rsa_blinding.c SRCS+= rsa_chk.c -SRCS+= rsa_crpt.c SRCS+= rsa_eay.c SRCS+= rsa_err.c SRCS+= rsa_gen.c diff --git a/lib/libcrypto/rsa/rsa_crpt.c b/lib/libcrypto/rsa/rsa_crpt.c deleted file mode 100644 index 2a23c1bb881..00000000000 --- a/lib/libcrypto/rsa/rsa_crpt.c +++ /dev/null @@ -1,127 +0,0 @@ -/* $OpenBSD: rsa_crpt.c,v 1.28 2023/08/09 09:26:43 tb Exp $ */ -/* 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 <openssl/opensslconf.h> - -#include <openssl/bn.h> -#include <openssl/crypto.h> -#include <openssl/err.h> -#include <openssl/lhash.h> -#include <openssl/rsa.h> - -#include "bn_local.h" -#include "rsa_local.h" - -#ifndef OPENSSL_NO_ENGINE -#include <openssl/engine.h> -#endif - -int -RSA_bits(const RSA *r) -{ - return BN_num_bits(r->n); -} -LCRYPTO_ALIAS(RSA_bits); - -int -RSA_size(const RSA *r) -{ - return BN_num_bytes(r->n); -} -LCRYPTO_ALIAS(RSA_size); - -int -RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) -{ - return rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding); -} -LCRYPTO_ALIAS(RSA_public_encrypt); - -int -RSA_private_encrypt(int flen, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) -{ - return rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding); -} -LCRYPTO_ALIAS(RSA_private_encrypt); - -int -RSA_private_decrypt(int flen, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) -{ - return rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding); -} -LCRYPTO_ALIAS(RSA_private_decrypt); - -int -RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to, - RSA *rsa, int padding) -{ - return rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding); -} -LCRYPTO_ALIAS(RSA_public_decrypt); - -int -RSA_flags(const RSA *r) -{ - return r == NULL ? 0 : r->meth->flags; -} -LCRYPTO_ALIAS(RSA_flags); diff --git a/lib/libcrypto/rsa/rsa_eay.c b/lib/libcrypto/rsa/rsa_eay.c index cd0ff9730c0..35b32f6d02c 100644 --- a/lib/libcrypto/rsa/rsa_eay.c +++ b/lib/libcrypto/rsa/rsa_eay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_eay.c,v 1.63 2023/08/02 08:44:38 tb Exp $ */ +/* $OpenBSD: rsa_eay.c,v 1.64 2023/08/09 09:32:23 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -857,3 +857,56 @@ RSA_PKCS1_SSLeay(void) return RSA_PKCS1_OpenSSL(); } LCRYPTO_ALIAS(RSA_PKCS1_SSLeay); + +int +RSA_bits(const RSA *r) +{ + return BN_num_bits(r->n); +} +LCRYPTO_ALIAS(RSA_bits); + +int +RSA_size(const RSA *r) +{ + return BN_num_bytes(r->n); +} +LCRYPTO_ALIAS(RSA_size); + +int +RSA_public_encrypt(int flen, const unsigned char *from, unsigned char *to, + RSA *rsa, int padding) +{ + return rsa->meth->rsa_pub_enc(flen, from, to, rsa, padding); +} +LCRYPTO_ALIAS(RSA_public_encrypt); + +int +RSA_private_encrypt(int flen, const unsigned char *from, unsigned char *to, + RSA *rsa, int padding) +{ + return rsa->meth->rsa_priv_enc(flen, from, to, rsa, padding); +} +LCRYPTO_ALIAS(RSA_private_encrypt); + +int +RSA_private_decrypt(int flen, const unsigned char *from, unsigned char *to, + RSA *rsa, int padding) +{ + return rsa->meth->rsa_priv_dec(flen, from, to, rsa, padding); +} +LCRYPTO_ALIAS(RSA_private_decrypt); + +int +RSA_public_decrypt(int flen, const unsigned char *from, unsigned char *to, + RSA *rsa, int padding) +{ + return rsa->meth->rsa_pub_dec(flen, from, to, rsa, padding); +} +LCRYPTO_ALIAS(RSA_public_decrypt); + +int +RSA_flags(const RSA *r) +{ + return r == NULL ? 0 : r->meth->flags; +} +LCRYPTO_ALIAS(RSA_flags); |