Commit 79df9d62 authored by Ulf Möller's avatar Ulf Möller
Browse files

New Configure option no-<cipher> (rsa, idea, rc5, ...).

parent 281c52c0

Configure

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ my $usage="Usage: Configure [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [rsaref] [no 
# rsaref        use RSAref

# no-asm        do not use assembler

# 386           generate 80386 code

# no-CIPHER     build without specified algorithm

# no-<cipher>   build without specified algorithm (rsa, idea, rc5, ...)

# -D, -L, -l, -f, -K: compiler options are passed through 

# 

# DES_PTR	use pointer lookup vs arrays in the DES in crypto/des/des_locl.h

crypto/rsa/rsa_eay.c

+4 −0
Original line number Diff line number Diff line
@@ -115,9 +115,11 @@ static int RSA_eay_public_encrypt(int flen, unsigned char *from, 
	case RSA_PKCS1_PADDING:

		i=RSA_padding_add_PKCS1_type_2(buf,num,from,flen);

		break;

#ifndef NO_SHA

	case RSA_PKCS1_OAEP_PADDING:

	        i=RSA_padding_add_PKCS1_OAEP(buf,num,from,flen,NULL,0);

		break;

#endif

	case RSA_SSLV23_PADDING:

		i=RSA_padding_add_SSLv23(buf,num,from,flen);

		break;
@@ -299,9 +301,11 @@ static int RSA_eay_private_decrypt(int flen, unsigned char *from, 
	case RSA_PKCS1_PADDING:

		r=RSA_padding_check_PKCS1_type_2(to,num,buf,j,num);

		break;

#ifndef NO_SHA

        case RSA_PKCS1_OAEP_PADDING:

	        r=RSA_padding_check_PKCS1_OAEP(to,num,buf,j,num,NULL,0);

                break;

#endif

 	case RSA_SSLV23_PADDING:

		r=RSA_padding_check_SSLv23(to,num,buf,j,num);

		break;

crypto/rsa/rsa_oaep.c

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


/* EME_OAEP as defined in RFC 2437 (PKCS #1 v2.0) */



#ifndef NO_SHA

#include <stdio.h>

#include "cryptlib.h"

#include <openssl/bn.h>
@@ -156,3 +157,4 @@ int MGF1(unsigned char *mask, long len, unsigned char *seed, long seedlen) 
	}

    return (0);

    }

#endif

rsaref/rsaref.c

+2 −1
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
 * [including the GNU Public Licence.]

 */



#ifndef NO_RSA

#include <stdio.h>

#include "cryptlib.h"

#include <openssl/bn.h>
@@ -296,4 +297,4 @@ err: 
	memset(&rnd,0,sizeof(rnd));

	return(outlen);

	}

#endif

rsaref/rsaref.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
#ifndef HEADER_RSAREF_H

#define HEADER_RSAREF_H



#ifndef NO_RSA

#include <openssl/rsa.h>



/* RSAeuro */
@@ -128,6 +129,7 @@ int R_RandomFinal(RSARandomState *rnd); 


void ERR_load_RSAREF_strings(void );

RSA_METHOD *RSA_PKCS1_RSAref(void );

#endif



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes