wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ulf Möller 1999-04-27 01:14:46 +00:00
parent b64f825671
commit f5d7a031a3
115 changed files with 480 additions and 140 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -5,6 +5,9 @@
Changes between 0.9.2b and 0.9.3
*) New Configure option no-<cipher> (rsa, idea, rc5, ...).
[Ulf Möller]
*) Add the PKCS#12 API documentation to openssl.txt. Preliminary support for
extension adding in x509 utility.
[Steve Henson]

30
Configure
View file

@ -20,16 +20,9 @@ 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
# -D, -L, -l, -f, -K: compiler options are passed through
#
# -DRSAref build to use RSAref
# -DNO_IDEA build with no IDEA algorithm
# -DNO_RC4 build with no RC4 algorithm
# -DNO_RC2 build with no RC2 algorithm
# -DNO_BF build with no Blowfish algorithm
# -DNO_DES build with no DES/3DES algorithm
# -DNO_MD2 build with no MD2 algorithm
#
# DES_PTR use pointer lookup vs arrays in the DES in crypto/des/des_locl.h
# DES_RISC1 use different DES_ENCRYPT macro that helps reduce register
# dependancies but needs to more registers, good for RISC CPU's
@ -255,6 +248,7 @@ my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
my $installprefix="";
my $openssldir="";
my $no_asm=0;
my @skip=();
my $Makefile="Makefile.ssl";
my $des_locl="crypto/des/des_locl.h";
my $des ="crypto/des/des.h";
@ -284,12 +278,21 @@ $perl=&which("perl5") or $perl=&which("perl");
&usage if ($#ARGV < 0);
my $flags="";
my $depflags="";
my $libs="";
my $target="";
foreach (@ARGV)
{
if (/^no-asm$/)
{ $no_asm=1; }
elsif (/^no-(.+)$/)
{
my $algo=$1;
push @skip,$algo;
$algo =~ tr/[a-z]/[A-Z]/;
$flags .= "-DNO_$algo ";
$depflags .= "-DNO_$algo ";
}
elsif (/^386$/)
{ $processor=386; }
elsif (/^rsaref$/)
@ -390,14 +393,24 @@ if ($rmd160_obj =~ /\.o$/)
open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
my $sdirs=0;
while (<IN>)
{
chop;
$sdirs = 1 if /^SDIRS=/;
$sdirs = 0 unless /\\$/;
if ($sdirs) {
my $dir;
foreach $dir (@skip) {
s/$dir//;
}
}
s/^INSTALLTOP=.*$/INSTALLTOP=$installprefix/;
s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
s/^PLATFORM=.*$/PLATFORM=$target/;
s/^CC=.*$/CC= $cc/;
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG= $depflags/;
s/^EX_LIBS=.*$/EX_LIBS= $lflags/;
s/^BN_ASM=.*$/BN_ASM= $bn_obj/;
s/^DES_ENC=.*$/DES_ENC= $des_obj/;
@ -551,6 +564,7 @@ if($IsWindows) {
close(OUT);
} else {
(system 'make -f Makefile.ssl links') == 0 or exit $?;
(system 'make depend') == 0 or exit $? if $depflags ne "";
&dofile("tools/c_rehash",$openssldir,'^DIR=', 'DIR=%s',);
&dofile("util/mk1mf.pl",$openssldir,
('^\$INSTALLTOP=','$INSTALLTOP="%s";',));

3
Makefile.org
View file

@ -43,6 +43,7 @@ OPENSSLDIR=/usr/local/ssl
CC= gcc
#CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM
DEPFLAG=
PEX_LIBS= -L. -L.. -L../.. -L../../..
EX_LIBS=
AR=ar r
@ -246,7 +247,7 @@ depend:
@for i in $(DIRS) ;\
do \
(cd $$i && echo "making dependancies $$i..." && \
$(MAKE) SDIRS='${SDIRS}' depend ) || exit 1; \
$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' depend ) || exit 1; \
done;
lint:

9
STATUS
View file

@ -1,6 +1,6 @@
OpenSSL STATUS Last modified at
______________ $Date: 1999/04/27 00:36:14 $
______________ $Date: 1999/04/27 01:13:19 $
DEVELOPMENT STATE
@ -149,13 +149,6 @@
o Properly initialize the PRNG in the absence of /dev/random.
o > NO_RSA (ejs@bfd.com)
> ./Configure -DNO_IDEA -DNO_RC5 -DNO_RC4 -DNO_RC2 -DNO_RSA -DNO_ERR linux-elf
> I tried for a whole day to do this and could not get it to work. Linux
> machine, kernel 2.0.36 and 2.2.1, redhat 5.2 latest, gcc and egcs , no
> go. I also noticed the even with -DNO_IDEA, _DNO_RC2, etc. the make
> still goes into those subdirectories and 'makes'.
o ERR_error_string(..., buf) does not know how large buf is,
there should be ERR_error_string_n(..., buf, bufsize)
or similar.

2
apps/Makefile.ssl
View file

@ -109,7 +109,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(SRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(SRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
apps/ciphers.c
View file

@ -66,6 +66,10 @@
#include <openssl/err.h>
#include <openssl/ssl.h>
#if defined(NO_RSA) && !defined(NO_SSL2)
#define NO_SSL2
#endif
#undef PROG
#define PROG ciphers_main

2
apps/dh.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DH
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@ -308,3 +309,4 @@ end:
if (dh != NULL) DH_free(dh);
EXIT(ret);
}
#endif

3
apps/dsa.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -252,4 +253,4 @@ end:
if (dsa != NULL) DSA_free(dsa);
EXIT(ret);
}
#endif

2
apps/dsaparam.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include <stdlib.h>
#include <time.h>
@ -349,3 +350,4 @@ static void MS_CALLBACK dsa_cb(int p, int n, char *arg)
p=n;
#endif
}
#endif

2
apps/enc.c
View file

@ -65,7 +65,7 @@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>
#ifdef NO_MD5
#ifndef NO_MD5
#include <openssl/md5.h>
#endif
#include <openssl/pem.h>

4
apps/gendh.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DH
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@ -219,5 +220,4 @@ static long dh_load_rand(char *name)
}
return(tot);
}
#endif

4
apps/gendsa.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@ -228,5 +229,4 @@ static long dsa_load_rand(char *name)
}
return(tot);
}
#endif

4
apps/genrsa.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include <string.h>
#include <sys/types.h>
@ -262,5 +263,4 @@ static long gr_load_rand(char *name)
}
return(tot);
}
#endif

2
apps/pem_mail.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include <openssl/rsa.h>
#include <openssl/evp.h>
@ -166,3 +167,4 @@ err:
ERR_print_errors(bio_err);
EXIT(1);
}
#endif

3
apps/rsa.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -298,4 +299,4 @@ end:
if (rsa != NULL) RSA_free(rsa);
EXIT(ret);
}
#endif

4
apps/s_client.c
View file

@ -70,6 +70,10 @@
#include <openssl/pem.h>
#include "s_apps.h"
#if defined(NO_RSA) && !defined(NO_SSL2)
#define NO_SSL2
#endif
#undef PROG
#define PROG s_client_main

12
apps/s_server.c
View file

@ -74,7 +74,13 @@
#include <openssl/ssl.h>
#include "s_apps.h"
#if defined(NO_RSA) && !defined(NO_SSL2)
#define NO_SSL2
#endif
#ifndef NO_RSA
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export,int keylength);
#endif
static int sv_body(char *hostname, int s, unsigned char *context);
static int www_body(char *hostname, int s, unsigned char *context);
static void close_accept_socket(void );
@ -470,6 +476,7 @@ bad:
goto end;
}
#ifndef NO_RSA
#if 1
SSL_CTX_set_tmp_rsa_callback(ctx,tmp_rsa_cb);
#else
@ -490,6 +497,7 @@ bad:
RSA_free(rsa);
BIO_printf(bio_s_out,"\n");
}
#endif
#endif
if (cipher != NULL)
@ -1199,6 +1207,7 @@ err:
return(ret);
}
#ifndef NO_RSA
static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export, int keylength)
{
static RSA *rsa_tmp=NULL;
@ -1210,9 +1219,7 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export, int keylength)
BIO_printf(bio_err,"Generating temp (%d bit) RSA key...",keylength);
BIO_flush(bio_err);
}
#ifndef NO_RSA
rsa_tmp=RSA_generate_key(keylength,RSA_F4,NULL,NULL);
#endif
if (!s_quiet)
{
BIO_printf(bio_err,"\n");
@ -1221,3 +1228,4 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int export, int keylength)
}
return(rsa_tmp);
}
#endif

4
apps/s_time.c
View file

@ -67,6 +67,10 @@
#include <stdlib.h>
#include <string.h>
#if defined(NO_RSA) && !defined(NO_SSL2)
#define NO_SSL2
#endif
#ifdef NO_STDIO
#define APPS_WIN16
#endif

43
apps/speed.c
View file

@ -127,10 +127,10 @@ struct tms {
#include <openssl/hmac.h>
#include <openssl/evp.h>
#endif
#ifndef NO_SHA1
#ifndef NO_SHA
#include <openssl/sha.h>
#endif
#ifndef NO_RMD160
#ifndef NO_RIPEMD
#include <openssl/ripemd.h>
#endif
#ifndef NO_RC4
@ -145,7 +145,7 @@ struct tms {
#ifndef NO_IDEA
#include <openssl/idea.h>
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
#include <openssl/blowfish.h>
#endif
#ifndef NO_CAST
@ -153,9 +153,9 @@ struct tms {
#endif
#ifndef NO_RSA
#include <openssl/rsa.h>
#include "./testrsa.h"
#endif
#include <openssl/x509.h>
#include "./testrsa.h"
#ifndef NO_DSA
#include "./testdsa.h"
#endif
@ -261,10 +261,10 @@ int MAIN(int argc, char **argv)
unsigned char md5[MD5_DIGEST_LENGTH];
unsigned char hmac[MD5_DIGEST_LENGTH];
#endif
#ifndef NO_SHA1
#ifndef NO_SHA
unsigned char sha[SHA_DIGEST_LENGTH];
#endif
#ifndef NO_RMD160
#ifndef NO_RIPEMD
unsigned char rmd160[RIPEMD160_DIGEST_LENGTH];
#endif
#ifndef NO_RC4
@ -279,7 +279,7 @@ int MAIN(int argc, char **argv)
#ifndef NO_IDEA
IDEA_KEY_SCHEDULE idea_ks;
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
BF_KEY bf_ks;
#endif
#ifndef NO_CAST
@ -323,9 +323,9 @@ int MAIN(int argc, char **argv)
#define R_RSA_1024 1
#define R_RSA_2048 2
#define R_RSA_4096 3
#ifndef NO_RSA
RSA *rsa_key[RSA_NUM];
long rsa_c[RSA_NUM][2];
#ifndef NO_RSA
double rsa_results[RSA_NUM][2];
static unsigned int rsa_bits[RSA_NUM]={512,1024,2048,4096};
static unsigned char *rsa_data[RSA_NUM]=
@ -346,7 +346,7 @@ int MAIN(int argc, char **argv)
int pr_header=0;
apps_startup();
#ifdef NO_DSA
#ifndef NO_DSA
memset(dsa_key,0,sizeof(dsa_key));
#endif
@ -402,13 +402,13 @@ int MAIN(int argc, char **argv)
if (strcmp(*argv,"hmac") == 0) doit[D_HMAC]=1;
else
#endif
#ifndef NO_SHA1
#ifndef NO_SHA
if (strcmp(*argv,"sha1") == 0) doit[D_SHA1]=1;
else
if (strcmp(*argv,"sha") == 0) doit[D_SHA1]=1;
else
#endif
#ifndef NO_RMD160
#ifndef NO_RIPEMD
if (strcmp(*argv,"ripemd") == 0) doit[D_RMD160]=1;
else
if (strcmp(*argv,"rmd160") == 0) doit[D_RMD160]=1;
@ -464,7 +464,7 @@ int MAIN(int argc, char **argv)
else if (strcmp(*argv,"idea") == 0) doit[D_CBC_IDEA]=1;
else
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
if (strcmp(*argv,"bf-cbc") == 0) doit[D_CBC_BF]=1;
else if (strcmp(*argv,"blowfish") == 0) doit[D_CBC_BF]=1;
else if (strcmp(*argv,"bf") == 0) doit[D_CBC_BF]=1;
@ -514,10 +514,10 @@ int MAIN(int argc, char **argv)
#ifndef NO_RC5
BIO_printf(bio_err,"rc5-cbc ");
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
BIO_printf(bio_err,"bf-cbc");
#endif
#if !defined(NO_IDEA) && !defined(NO_RC2) && !defined(NO_BLOWFISH) && !defined(NO_RC5)
#if !defined(NO_IDEA) && !defined(NO_RC2) && !defined(NO_BF) && !defined(NO_RC5)
BIO_printf(bio_err,"\n");
#endif
BIO_printf(bio_err,"des-cbc des-ede3 ");
@ -601,14 +601,15 @@ int MAIN(int argc, char **argv)
#ifndef NO_RC5
RC5_32_set_key(&rc5_ks,16,key16,12);
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
BF_set_key(&bf_ks,16,key16);
#endif
#ifndef NO_CAST
CAST_set_key(&cast_ks,16,key16);
#endif
#ifndef NO_RSA
memset(rsa_c,0,sizeof(rsa_c));
#endif
#ifndef SIGALRM
BIO_printf(bio_err,"First we calculate the approximate speed ...\n");
count=10;
@ -659,6 +660,7 @@ int MAIN(int argc, char **argv)
c[D_CBC_BF][i]=c[D_CBC_BF][i-1]*l0/l1;
c[D_CBC_CAST][i]=c[D_CBC_CAST][i-1]*l0/l1;
}
#ifndef NO_RSA
rsa_c[R_RSA_512][0]=count/2000;
rsa_c[R_RSA_512][1]=count/400;
for (i=1; i<RSA_NUM; i++)
@ -676,6 +678,7 @@ int MAIN(int argc, char **argv)
}
}
}
#endif
dsa_c[R_DSA_512][0]=count/1000;
dsa_c[R_DSA_512][1]=count/1000/2;
@ -777,7 +780,7 @@ int MAIN(int argc, char **argv)
}
}
#endif
#ifndef NO_SHA1
#ifndef NO_SHA
if (doit[D_SHA1])
{
for (j=0; j<SIZE_NUM; j++)
@ -793,7 +796,7 @@ int MAIN(int argc, char **argv)
}
}
#endif
#ifndef NO_RMD160
#ifndef NO_RIPEMD
if (doit[D_RMD160])
{
for (j=0; j<SIZE_NUM; j++)
@ -914,7 +917,7 @@ int MAIN(int argc, char **argv)
}
}
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
if (doit[D_CBC_BF])
{
for (j=0; j<SIZE_NUM; j++)
@ -1092,7 +1095,7 @@ int MAIN(int argc, char **argv)
#ifndef NO_IDEA
printf("%s ",idea_options());
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
printf("%s ",BF_options());
#endif
fprintf(stdout,"\n%s\n",SSLeay_version(SSLEAY_CFLAGS));

2
apps/version.c
View file

@ -119,7 +119,7 @@ int MAIN(int argc, char **argv)
#ifndef NO_IDEA
printf("%s ",idea_options());
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
printf("%s ",BF_options());
#endif
printf("\n");

4
crypto/Makefile.ssl
View file

@ -115,11 +115,11 @@ lint:
done;
depend:
$(MAKEDEPEND) $(INCLUDE) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)
@for i in $(SDIRS) ;\
do \
(cd $$i; echo "making depend in crypto/$$i..."; \
$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' depend ); \
$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
done;
clean:

2
crypto/asn1/Makefile.ssl
View file

@ -101,7 +101,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

3
crypto/asn1/d2i_dhp.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DH
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -97,4 +98,4 @@ err:
if (bs != NULL) ASN1_BIT_STRING_free(bs);
return(NULL);
}
#endif

3
crypto/asn1/d2i_dsap.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -90,4 +91,4 @@ err:
if (bs != NULL) ASN1_BIT_STRING_free(bs);
return(NULL);
}
#endif

3
crypto/asn1/d2i_r_pr.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -117,4 +118,4 @@ err:
if (bs != NULL) ASN1_INTEGER_free(bs);
return(NULL);
}
#endif

3
crypto/asn1/d2i_r_pu.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -89,4 +90,4 @@ err:
if (bs != NULL) ASN1_INTEGER_free(bs);
return(NULL);
}
#endif

3
crypto/asn1/d2i_s_pr.c
View file

@ -58,6 +58,7 @@
/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
#ifndef NO_DSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -101,4 +102,4 @@ err:
if (bs != NULL) ASN1_INTEGER_free(bs);
return(NULL);
}
#endif

5
crypto/asn1/d2i_s_pu.c
View file

@ -56,8 +56,9 @@
* [including the GNU Public Licence.]
*/
/* Origional version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
/* Original version from Steven Schoch <schoch@sheba.arc.nasa.gov> */
#ifndef NO_DSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -113,4 +114,4 @@ err:
if (bs != NULL) ASN1_INTEGER_free(bs);
return(NULL);
}
#endif

2
crypto/asn1/i2d_dhp.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DH
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -119,3 +120,4 @@ err:
*pp=p;
return(ret);
}
#endif

2
crypto/asn1/i2d_dsap.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -112,4 +113,5 @@ err:
*pp=p;
return(ret);
}
#endif

2
crypto/asn1/i2d_r_pr.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -122,4 +123,5 @@ int i2d_RSAPrivateKey(RSA *a, unsigned char **pp)
*pp=p;
return(t);
}
#endif

3
crypto/asn1/i2d_r_pu.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -108,4 +109,4 @@ int i2d_RSAPublicKey(RSA *a, unsigned char **pp)
*pp=p;
return(t);
}
#endif

3
crypto/asn1/i2d_s_pr.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -119,4 +120,4 @@ int i2d_DSAPrivateKey(DSA *a, unsigned char **pp)
*pp=p;
return(t);
}
#endif

3
crypto/asn1/i2d_s_pu.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_DSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/bn.h>
@ -124,4 +125,4 @@ int i2d_DSAPublicKey(DSA *a, unsigned char **pp)
*pp=p;
return(t);
}
#endif

4
crypto/asn1/n_pkey.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/rsa.h>
@ -78,6 +79,7 @@ static int i2d_NETSCAPE_PKEY(NETSCAPE_PKEY *a, unsigned char **pp);
static NETSCAPE_PKEY *d2i_NETSCAPE_PKEY(NETSCAPE_PKEY **a,unsigned char **pp, long length);
static NETSCAPE_PKEY *NETSCAPE_PKEY_new(void);
static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *);
int i2d_Netscape_RSA(RSA *a, unsigned char **pp, int (*cb)())
{
int i,j,l[6];
@ -336,4 +338,4 @@ static void NETSCAPE_PKEY_free(NETSCAPE_PKEY *a)
}
#endif /* NO_RC4 */
#endif

2
crypto/bf/Makefile.ssl
View file

@ -91,7 +91,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

9
crypto/bf/bftest.c
View file

@ -62,6 +62,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_BF
int main(int argc, char *argv[])
{
printf("No BF support\n");
return(0);
}
#else
#include <openssl/blowfish.h>
char *bf_key[2]={
@ -511,3 +519,4 @@ static int test(void)
return(err);
}
#endif

4
crypto/bf/blowfish.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_BF
#error BF is disabled.
#endif
#define BF_ENCRYPT 1
#define BF_DECRYPT 0

2
crypto/bio/Makefile.ssl
View file

@ -73,7 +73,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/bn/Makefile.ssl
View file

@ -140,7 +140,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/buffer/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/cast/Makefile.ssl
View file

@ -94,7 +94,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/cast/cast.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_CAST
#error CAST is disabled.
#endif
#define CAST_ENCRYPT 1
#define CAST_DECRYPT 0

10
crypto/cast/casttest.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_CAST
int main(int argc, char *argv[])
{
printf("No CAST support\n");
return(0);
}
#else
#include <openssl/cast.h>
#define FULL_TEST
@ -219,4 +227,4 @@ int main(int argc, char *argv[])
exit(err);
return(err);
}
#endif

2
crypto/comp/Makefile.ssl
View file

@ -68,7 +68,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/conf/Makefile.ssl
View file

@ -66,7 +66,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/des/Makefile.ssl
View file

@ -123,7 +123,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/des/des.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_DES
#error DES is disabled.
#endif
#include <stdio.h>
#include <openssl/opensslconf.h> /* DES_LONG */

13
crypto/des/destest.c
View file

@ -70,6 +70,14 @@
#include <io.h>
#endif
#include <string.h>
#ifdef NO_DES
int main(int argc, char *argv[])
{
printf("No DES support\n");
return(0);
}
#else
#include <openssl/des.h>
#if defined(PERL5) || defined(__FreeBSD__)
@ -318,6 +326,7 @@ int main(int argc, char *argv[])
int num;
char *str;
#ifndef NO_DESCBCM
printf("Doing cbcm\n");
if ((j=des_key_sched(cbc_key,ks)) != 0)
{
@ -368,7 +377,7 @@ int main(int argc, char *argv[])
printf("\n");
err=1;
}
#endif
printf("Doing ecb\n");
for (i=0; i<NUM_TESTS; i++)
@ -908,4 +917,4 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
}
#endif
#endif

2
crypto/des/ede_cbcm_enc.c
View file

@ -68,6 +68,7 @@ http://www.cs.technion.ac.il/users/wwwb/cgi-bin/tr-get.cgi/1998/CS/CS0928.ps.gz
*/
#ifndef NO_DESCBCM
#include "des_locl.h"
void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
@ -192,3 +193,4 @@ void des_ede3_cbcm_encrypt(const unsigned char *in, unsigned char *out,
tin0=tin1=tout0=tout1=xor0=xor1=0;
tin[0]=tin[1]=0;
}
#endif

2
crypto/dh/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/dh/dh.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_DH
#error DH is disabled.
#endif
#include <openssl/bn.h>
#define DH_FLAG_CACHE_MONT_P 0x01

9
crypto/dh/dhtest.c
View file

@ -65,6 +65,14 @@
#include <openssl/crypto.h>
#include <openssl/bio.h>
#include <openssl/bn.h>
#ifdef NO_DH
int main(int argc, char *argv[])
{
printf("No DH support\n");
return(0);
}
#else
#include <openssl/dh.h>
#ifdef WIN16
@ -177,3 +185,4 @@ static void MS_CALLBACK cb(int p, int n, char *arg)
p=n;
#endif
}
#endif

2
crypto/dsa/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/dsa/dsa.h
View file

@ -69,6 +69,10 @@
extern "C" {
#endif
#ifdef NO_DSA
#error DSA is disabled.
#endif
#include <openssl/bn.h>
#define DSA_FLAG_CACHE_MONT_P 0x01

13
crypto/dsa/dsatest.c
View file

@ -65,11 +65,19 @@
#include <openssl/rand.h>
#include <openssl/bio.h>
#include <openssl/err.h>
#include <openssl/dsa.h>
#ifdef WINDOWS
#include "../bio/bss_file.c"
#endif
#ifdef NO_DSA
int main(int argc, char *argv[])
{
printf("No DSA support\n");
return(0);
}
#else
#include <openssl/dsa.h>
#ifdef WIN16
#define MS_CALLBACK _far _loadds
#else
@ -206,5 +214,4 @@ static void MS_CALLBACK dsa_cb(int p, int n, char *arg)
exit(1);
}
}
#endif

2
crypto/err/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/evp/Makefile.ssl
View file

@ -92,7 +92,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

24
crypto/evp/evp.h
View file

@ -69,10 +69,10 @@ extern "C" {
#ifndef NO_MD5
#include <openssl/md5.h>
#endif
#if !defined(NO_SHA) || !defined(NO_SHA1)
#ifndef NO_SHA
#include <openssl/sha.h>
#endif
#ifndef NO_RMD160
#ifndef NO_RIPEMD
#include <openssl/ripemd.h>
#endif
#ifndef NO_DES
@ -87,7 +87,7 @@ extern "C" {
#ifndef NO_RC5
#include <openssl/rc5.h>
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
#include <openssl/blowfish.h>
#endif
#ifndef NO_CAST
@ -111,20 +111,14 @@ extern "C" {
#ifndef NO_RSA
#include <openssl/rsa.h>
#else
#define RSA long
#endif
#ifndef NO_DSA
#include <openssl/dsa.h>
#else
#define DSA long
#endif
#ifndef NO_DH
#include <openssl/dh.h>
#else
#define DH long
#endif
#include <openssl/objects.h>
@ -159,9 +153,15 @@ typedef struct evp_pkey_st
int references;
union {
char *ptr;
#ifndef NO_RSA
struct rsa_st *rsa; /* RSA */
#endif
#ifndef NO_DSA
struct dsa_st *dsa; /* DSA */
#endif
#ifndef NO_DH
struct dh_st *dh; /* DH */
#endif
} pkey;
int save_parameters;
STACK /*X509_ATTRIBUTE*/ *attributes; /* [ 0 ] */
@ -294,10 +294,10 @@ typedef struct env_md_ctx_st
#ifndef NO_MD5
MD5_CTX md5;
#endif
#ifndef NO_RMD160
#ifndef NO_RIPEMD
RIPEMD160_CTX ripemd160;
#endif
#if !defined(NO_SHA) || !defined(NO_SHA1)
#ifndef NO_SHA
SHA_CTX sha;
#endif
#ifndef NO_MDC2
@ -372,7 +372,7 @@ typedef struct evp_cipher_ctx_st
#ifndef NO_RC5
RC5_32_KEY rc5_ks;/* key schedule */
#endif
#ifndef NO_BLOWFISH
#ifndef NO_BF
BF_KEY bf_ks;/* key schedule */
#endif
#ifndef NO_CAST

23
crypto/evp/evp_pkey.c
View file

@ -67,14 +67,19 @@
EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
{
EVP_PKEY *pkey;
#ifndef NO_RSA
RSA *rsa;
#endif
#ifndef NO_DSA
DSA *dsa;
ASN1_INTEGER *dsapriv;
X509_ALGOR *a;
STACK *ndsa;
BN_CTX *ctx;
int plen;
#endif
X509_ALGOR *a;
unsigned char *p;
int plen, pkeylen;
int pkeylen;
char obj_tmp[80];
switch (p8->broken) {
@ -100,6 +105,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
a = p8->pkeyalg;
switch (OBJ_obj2nid(a->algorithm))
{
#ifndef NO_RSA
case NID_rsaEncryption:
if (!(rsa = d2i_RSAPrivateKey (NULL, &p, pkeylen))) {
EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_DECODE_ERROR);
@ -107,7 +113,8 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
}
EVP_PKEY_assign_RSA (pkey, rsa);
break;
#endif
#ifndef NO_DSA
case NID_dsa:
/* PKCS#8 DSA is weird: you just get a private key integer
* and parameters in the AlgorithmIdentifier the pubkey must
@ -174,7 +181,7 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
EVP_PKEY_assign_DSA (pkey, dsa);
BN_CTX_free (ctx);
break;
#endif
default:
EVPerr(EVP_F_EVP_PKCS82PKEY, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
if (!a->algorithm) strcpy (obj_tmp, "NULL");
@ -191,9 +198,11 @@ EVP_PKEY *EVP_PKCS82PKEY (PKCS8_PRIV_KEY_INFO *p8)
PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
{
PKCS8_PRIV_KEY_INFO *p8;
#ifndef NO_DSA
ASN1_INTEGER *dpkey;
unsigned char *p, *q;
int len;
#endif
if (!(p8 = PKCS8_PRIV_KEY_INFO_new())) {
EVPerr(EVP_F_EVP_PKEY2PKCS8,ERR_R_MALLOC_FAILURE);
return NULL;
@ -205,6 +214,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
return NULL;
}
switch (EVP_PKEY_type(pkey->type)) {
#ifndef NO_RSA
case EVP_PKEY_RSA:
p8->pkeyalg->algorithm = OBJ_nid2obj(NID_rsaEncryption);
@ -216,7 +226,8 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
return NULL;
}
break;
#endif
#ifndef NO_DSA
case EVP_PKEY_DSA:
p8->pkeyalg->algorithm = OBJ_nid2obj(NID_dsa);
@ -249,7 +260,7 @@ PKCS8_PRIV_KEY_INFO *EVP_PKEY2PKCS8(EVP_PKEY *pkey)
}
ASN1_INTEGER_free (dpkey);
break;
#endif
default:
EVPerr(EVP_F_EVP_PKEY2PKCS8, EVP_R_UNSUPPORTED_PRIVATE_KEY_ALGORITHM);
PKCS8_PRIV_KEY_INFO_free (p8);

2
crypto/evp/p_open.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
@ -109,3 +110,4 @@ int EVP_OpenFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl)
EVP_DecryptInit(ctx,NULL,NULL,NULL);
return(i);
}
#endif

2
crypto/evp/p_seal.c
View file

@ -59,7 +59,9 @@
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/rand.h>
#ifndef NO_RSA
#include <openssl/rsa.h>
#endif
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/x509.h>

2
crypto/hmac/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/hmac/hmac.h
View file

@ -62,6 +62,10 @@
extern "C" {
#endif
#ifdef NO_HMAC
#error No HMAC support.
#endif
#include <openssl/evp.h>
#define HMAC_MAX_MD_CBLOCK 64

9
crypto/hmac/hmactest.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_HMAC
int main(int argc, char *argv[])
{
printf("No HMAC support\n");
return(0);
}
#else
#include <openssl/hmac.h>
struct test_st
@ -137,3 +145,4 @@ static char *pt(unsigned char *md)
sprintf(&(buf[i*2]),"%02x",md[i]);
return(buf);
}
#endif

2
crypto/idea/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/idea/idea.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_IDEA
#error IDEA is disabled.
#endif
#define IDEA_ENCRYPT 1
#define IDEA_DECRYPT 0

10
crypto/idea/ideatest.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_IDEA
int main(int argc, char *argv[])
{
printf("No IDEA support\n");
return(0);
}
#else
#include <openssl/idea.h>
unsigned char k[16]={
@ -219,4 +227,4 @@ static char *pt(unsigned char *p)
ret[16]='\0';
return(ret);
}
#endif

2
crypto/lhash/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/md2/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/md2/md2.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_MD2
#error MD2 is disabled.
#endif
#define MD2_DIGEST_LENGTH 16
#define MD2_BLOCK 16
#include <openssl/opensslconf.h> /* MD2_INT */

9
crypto/md2/md2test.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef NO_MD2
int main(int argc, char *argv[])
{
printf("No MD2 support\n");
return(0);
}
#else
#include <openssl/md2.h>
char *test[]={
@ -120,3 +128,4 @@ static char *pt(unsigned char *md)
sprintf(&(buf[i*2]),"%02x",md[i]);
return(buf);
}
#endif

2
crypto/md5/Makefile.ssl
View file

@ -89,7 +89,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/md5/md5.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_MD5
#error MD5 is disabled.
#endif
#define MD5_CBLOCK 64
#define MD5_LBLOCK 16
#define MD5_BLOCK 16

9
crypto/md5/md5test.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_MD5
int main(int argc, char *argv[])
{
printf("No MD5 support\n");
return(0);
}
#else
#include <openssl/md5.h>
char *test[]={
@ -120,3 +128,4 @@ static char *pt(unsigned char *md)
sprintf(&(buf[i*2]),"%02x",md[i]);
return(buf);
}
#endif

2
crypto/mdc2/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/mdc2/mdc2.h
View file

@ -65,6 +65,10 @@ extern "C" {
#include <openssl/des.h>
#ifdef NO_MDC2
#error MDC2 is disabled.
#endif
#define MDC2_BLOCK 8
#define MDC2_DIGEST_LENGTH 16

14
crypto/mdc2/mdc2test.c
View file

@ -59,6 +59,18 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef NO_DES
#define NO_MDC2
#endif
#ifdef NO_MDC2
int main(int argc, char *argv[])
{
printf("No MDC2 support\n");
return(0);
}
#else
#include <openssl/mdc2.h>
static unsigned char pad1[16]={
@ -117,4 +129,4 @@ int main(int argc, char *argv[])
exit(ret);
return(ret);
}
#endif

2
crypto/objects/Makefile.ssl
View file

@ -68,7 +68,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/objects/obj_dat.h
View file

@ -761,8 +761,8 @@ static ASN1_OBJECT *obj_objs[NUM_OBJ]={
&(nid_objs[19]),/* OBJ_rsa 2 5 8 1 1 */
&(nid_objs[96]),/* OBJ_mdc2WithRSA 2 5 8 3 100 */
&(nid_objs[95]),/* OBJ_mdc2 2 5 8 3 101 */
&(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666.2 */
&(nid_objs[124]),/* OBJ_rle_compression 1 1 1 1 666.1 */
&(nid_objs[125]),/* OBJ_zlib_compression 1 1 1 1 666.2 */
&(nid_objs[104]),/* OBJ_md5WithRSA 1 3 14 3 2 3 */
&(nid_objs[29]),/* OBJ_des_ecb 1 3 14 3 2 6 */
&(nid_objs[31]),/* OBJ_des_cbc 1 3 14 3 2 7 */

2
crypto/pem/Makefile.ssl
View file

@ -66,7 +66,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

34
crypto/pem/pem.h
View file

@ -372,28 +372,42 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str);
X509 *PEM_read_X509(FILE *fp,X509 **x,int (*cb)());
X509_REQ *PEM_read_X509_REQ(FILE *fp,X509_REQ **x,int (*cb)());
X509_CRL *PEM_read_X509_CRL(FILE *fp,X509_CRL **x,int (*cb)());
#ifndef NO_RSA
RSA *PEM_read_RSAPrivateKey(FILE *fp,RSA **x,int (*cb)());
RSA *PEM_read_RSAPublicKey(FILE *fp,RSA **x,int (*cb)());
#endif
#ifndef NO_DSA
DSA *PEM_read_DSAPrivateKey(FILE *fp,DSA **x,int (*cb)());
DSA *PEM_read_DSAparams(FILE *fp,DSA **x,int (*cb)());
#endif
#ifndef NO_DH
DH *PEM_read_DHparams(FILE *fp,DH **x,int (*cb)());
#endif
EVP_PKEY *PEM_read_PrivateKey(FILE *fp,EVP_PKEY **x,int (*cb)());
PKCS7 *PEM_read_PKCS7(FILE *fp,PKCS7 **x,int (*cb)());
DH *PEM_read_DHparams(FILE *fp,DH **x,int (*cb)());
DSA *PEM_read_DSAparams(FILE *fp,DSA **x,int (*cb)());
NETSCAPE_CERT_SEQUENCE *PEM_read_NETSCAPE_CERT_SEQUENCE(FILE *fp,NETSCAPE_CERT_SEQUENCE **x,int (*cb)());
int PEM_write_X509(FILE *fp,X509 *x);
int PEM_write_X509_REQ(FILE *fp,X509_REQ *x);
int PEM_write_X509_CRL(FILE *fp,X509_CRL *x);
#ifndef NO_RSA
int PEM_write_RSAPrivateKey(FILE *fp,RSA *x,EVP_CIPHER *enc,unsigned char *kstr,
int klen,int (*cb)());
int PEM_write_RSAPublicKey(FILE *fp,RSA *x);
#endif
#ifndef NO_DSA
int PEM_write_DSAPrivateKey(FILE *fp,DSA *x,const EVP_CIPHER *enc,
unsigned char *kstr,
int klen,int (*cb)());
#endif
int PEM_write_PrivateKey(FILE *fp,EVP_PKEY *x,EVP_CIPHER *enc,
unsigned char *kstr,int klen,int (*cb)());
int PEM_write_PKCS7(FILE *fp,PKCS7 *x);
#ifndef NO_DH
int PEM_write_DHparams(FILE *fp,DH *x);
#endif
#ifndef NO_DSA
int PEM_write_DSAparams(FILE *fp,DSA *x);
#endif
int PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp,NETSCAPE_CERT_SEQUENCE *x);
#endif
@ -401,27 +415,43 @@ int PEM_write_NETSCAPE_CERT_SEQUENCE(FILE *fp,NETSCAPE_CERT_SEQUENCE *x);
X509 *PEM_read_bio_X509(BIO *bp,X509 **x,int (*cb)());
X509_REQ *PEM_read_bio_X509_REQ(BIO *bp,X509_REQ **x,int (*cb)());
X509_CRL *PEM_read_bio_X509_CRL(BIO *bp,X509_CRL **x,int (*cb)());
#ifndef NO_RSA
RSA *PEM_read_bio_RSAPrivateKey(BIO *bp,RSA **x,int (*cb)());
RSA *PEM_read_bio_RSAPublicKey(BIO *bp,RSA **x,int (*cb)());
#endif
#ifndef NO_DSA
DSA *PEM_read_bio_DSAPrivateKey(BIO *bp,DSA **x,int (*cb)());
#endif
EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp,EVP_PKEY **x,int (*cb)());
PKCS7 *PEM_read_bio_PKCS7(BIO *bp,PKCS7 **x,int (*cb)());
#ifndef NO_DH
DH *PEM_read_bio_DHparams(BIO *bp,DH **x,int (*cb)());
#endif
NETSCAPE_CERT_SEQUENCE *PEM_read_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp,NETSCAPE_CERT_SEQUENCE **x,int (*cb)());
#ifndef NO_DSA
DSA *PEM_read_bio_DSAparams(BIO *bp,DSA **x,int (*cb)());
#endif
int PEM_write_bio_X509(BIO *bp,X509 *x);
int PEM_write_bio_X509_REQ(BIO *bp,X509_REQ *x);
int PEM_write_bio_X509_CRL(BIO *bp,X509_CRL *x);
#ifndef NO_RSA
int PEM_write_bio_RSAPrivateKey(BIO *fp,RSA *x,const EVP_CIPHER *enc,
unsigned char *kstr,int klen,int (*cb)());
int PEM_write_bio_RSAPublicKey(BIO *fp,RSA *x);
#endif
#ifndef NO_DSA
int PEM_write_bio_DSAPrivateKey(BIO *fp,DSA *x,const EVP_CIPHER *enc,
unsigned char *kstr,int klen,int (*cb)());
#endif
int PEM_write_bio_PrivateKey(BIO *fp,EVP_PKEY *x,EVP_CIPHER *enc,
unsigned char *kstr,int klen,int (*cb)());
int PEM_write_bio_PKCS7(BIO *bp,PKCS7 *x);
#ifndef NO_DH
int PEM_write_bio_DHparams(BIO *bp,DH *x);
#endif
#ifndef NO_DSA
int PEM_write_bio_DSAparams(BIO *bp,DSA *x);
#endif
int PEM_write_bio_NETSCAPE_CERT_SEQUENCE(BIO *bp,NETSCAPE_CERT_SEQUENCE *x);
#endif

2
crypto/pem/pem_seal.c
View file

@ -56,6 +56,7 @@
* [including the GNU Public Licence.]
*/
#ifndef NO_RSA
#include <stdio.h>
#include "cryptlib.h"
#include <openssl/evp.h>
@ -174,3 +175,4 @@ err:
if (s != NULL) Free(s);
return(ret);
}
#endif

2
crypto/pkcs12/Makefile.ssl
View file

@ -71,7 +71,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/pkcs12/p12_crpt.c
View file

@ -64,18 +64,22 @@
void PKCS12_PBE_add(void)
{
#ifndef NO_RC4
EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC4, EVP_rc4(), EVP_sha1(),
PKCS12_PBE_keyivgen);
EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC4, EVP_rc4_40(), EVP_sha1(),
PKCS12_PBE_keyivgen);
#endif
EVP_PBE_alg_add(NID_pbe_WithSHA1And3_Key_TripleDES_CBC,
EVP_des_ede3_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);
EVP_PBE_alg_add(NID_pbe_WithSHA1And2_Key_TripleDES_CBC,
EVP_des_ede_cbc(), EVP_sha1(), PKCS12_PBE_keyivgen);
#ifndef NO_RC2
EVP_PBE_alg_add(NID_pbe_WithSHA1And128BitRC2_CBC, EVP_rc2_cbc(),
EVP_sha1(), PKCS12_PBE_keyivgen);
EVP_PBE_alg_add(NID_pbe_WithSHA1And40BitRC2_CBC, EVP_rc2_40_cbc(),
EVP_sha1(), PKCS12_PBE_keyivgen);
#endif
}
int PKCS12_PBE_keyivgen (const char *pass, int passlen, unsigned char *salt,

2
crypto/pkcs7/Makefile.ssl
View file

@ -67,7 +67,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/rand/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

2
crypto/rc2/Makefile.ssl
View file

@ -65,7 +65,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/rc2/rc2.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_RC2
#error RC2 is disabled.
#endif
#define RC2_ENCRYPT 1
#define RC2_DECRYPT 0

9
crypto/rc2/rc2test.c
View file

@ -62,6 +62,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_RC2
int main(int argc, char *argv[])
{
printf("No RC2 support\n");
return(0);
}
#else
#include <openssl/rc2.h>
unsigned char RC2key[4][16]={
@ -258,3 +266,4 @@ static char *pt(unsigned char *p)
}
#endif
#endif

2
crypto/rc4/Makefile.ssl
View file

@ -93,7 +93,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/rc4/rc4.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_RC4
#error RC4 is disabled.
#endif
#include <openssl/opensslconf.h> /* RC4_INT */
typedef struct rc4_key_st

10
crypto/rc4/rc4test.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#ifdef NO_RC4
int main(int argc, char *argv[])
{
printf("No RC4 support\n");
return(0);
}
#else
#include <openssl/rc4.h>
unsigned char keys[7][30]={
@ -190,4 +198,4 @@ int main(int argc, char *argv[])
exit(err);
return(0);
}
#endif

2
crypto/rc5/Makefile.ssl
View file

@ -91,7 +91,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/rc5/rc5.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_RC5
#error RC5 is disabled.
#endif
#define RC5_ENCRYPT 1
#define RC5_DECRYPT 0

9
crypto/rc5/rc5test.c
View file

@ -62,6 +62,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_RC5
int main(int argc, char *argv[])
{
printf("No RC5 support\n");
return(0);
}
#else
#include <openssl/rc5.h>
unsigned char RC5key[5][16]={
@ -373,3 +381,4 @@ static char *pt(unsigned char *p)
}
#endif
#endif

2
crypto/ripemd/Makefile.ssl
View file

@ -89,7 +89,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

4
crypto/ripemd/ripemd.h
View file

@ -63,6 +63,10 @@
extern "C" {
#endif
#ifdef NO_RIPEMD
#error RIPEMD is disabled.
#endif
#define RIPEMD160_CBLOCK 64
#define RIPEMD160_LBLOCK 16
#define RIPEMD160_BLOCK 16

10
crypto/ripemd/rmdtest.c
View file

@ -59,6 +59,14 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#ifdef NO_RIPEMD
int main(int argc, char *argv[])
{
printf("No ripemd support\n");
return(0);
}
#else
#include <openssl/ripemd.h>
char *test[]={
@ -122,4 +130,4 @@ static char *pt(unsigned char *md)
sprintf(&(buf[i*2]),"%02x",md[i]);
return(buf);
}
#endif

2
crypto/rsa/Makefile.ssl
View file

@ -67,7 +67,7 @@ lint:
lint -DLINT $(INCLUDES) $(SRC)>fluff
depend:
$(MAKEDEPEND) $(INCLUDES) $(PROGS) $(LIBSRC)
$(MAKEDEPEND) $(INCLUDES) $(DEPFLAG) $(PROGS) $(LIBSRC)
dclean:
$(PERL) -pe 'if (/^# DO NOT DELETE THIS LINE/) {print; exit(0);}' $(MAKEFILE) >Makefile.new

Some files were not shown because too many files have changed in this diff Show more