generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix no-hmac and no-ripemd.

Browse Source
This commit is contained in:
Ulf Möller 1999-06-29 23:52:08 +00:00
parent ce8b257413
commit 5676d8cb76
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/speed.c
View File

@ -239,7 +239,6 @@ static double Time_F(int s)
int MAIN(int argc, char **argv) int MAIN(int argc, char **argv)
{ {
unsigned char *buf=NULL,*buf2=NULL; unsigned char *buf=NULL,*buf2=NULL;
des_cblock *buf_as_des_cblock = NULL;
int ret=1; int ret=1;
#define ALGOR_NUM 14 #define ALGOR_NUM 14
#define SIZE_NUM 5 #define SIZE_NUM 5
@ -286,6 +285,7 @@ int MAIN(int argc, char **argv)
0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; 0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
unsigned char iv[8]; unsigned char iv[8];
#ifndef NO_DES #ifndef NO_DES
des_cblock *buf_as_des_cblock = NULL;
static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; static des_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0};
static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; static des_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12};
static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; static des_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34};
@ -361,7 +361,9 @@ int MAIN(int argc, char **argv)
BIO_printf(bio_err,"out of memory\n"); BIO_printf(bio_err,"out of memory\n");
goto end; goto end;
} }
#ifndef NO_DES
buf_as_des_cblock = (des_cblock *)buf; buf_as_des_cblock = (des_cblock *)buf;
#endif
if ((buf2=(unsigned char *)Malloc((int)BUFSIZE)) == NULL) if ((buf2=(unsigned char *)Malloc((int)BUFSIZE)) == NULL)
{ {
BIO_printf(bio_err,"out of memory\n"); BIO_printf(bio_err,"out of memory\n");

2
config
View File

@ -365,7 +365,7 @@ case "$GUESSOS" in
i386-*) options="$options 386" ;; i386-*) options="$options 386" ;;
esac esac
for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 rsa sha for i in bf cast des dh dsa hmac md2 md5 mdc2 rc2 rc4 rc5 ripemd rsa sha
do do
if [ ! -d crypto/$i ] if [ ! -d crypto/$i ]
then then

3
crypto/evp/m_ripemd.c
View File

@ -56,8 +56,10 @@
* [including the GNU Public Licence.] * [including the GNU Public Licence.]
*/ */
#ifndef NO_RIPEMD
#include <stdio.h> #include <stdio.h>
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/ripemd.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/objects.h> #include <openssl/objects.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@ -79,3 +81,4 @@ EVP_MD *EVP_ripemd160(void)
{ {
return(&ripemd160_md); return(&ripemd160_md);
} }
#endif

3
crypto/evp/p5_crpt2.c
View File

@ -55,6 +55,7 @@
* Hudson (tjh@cryptsoft.com). * Hudson (tjh@cryptsoft.com).
* *
*/ */
#if !defined(NO_HMAC) && !defined(NO_SHA)
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <openssl/x509.h> #include <openssl/x509.h>
@ -218,4 +219,4 @@ int PKCS5_v2_PBE_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
PBKDF2PARAM_free(kdf); PBKDF2PARAM_free(kdf);
return 0; return 0;
} }
#endif

2
crypto/pkcs12/p12_mutl.c
View File

@ -56,6 +56,7 @@
* *
*/ */
#ifndef NO_HMAC
#include <stdio.h> #include <stdio.h>
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/hmac.h> #include <openssl/hmac.h>
@ -166,3 +167,4 @@ int PKCS12_setup_mac (PKCS12 *p12, int iter, unsigned char *salt, int saltlen,
return 1; return 1;
} }
#endif