Commit 566933a8 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from HEAD.

parent 5190ddd4

crypto/aes/aes_misc.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
#include <openssl/aes.h>

#include "aes_locl.h"



const char *AES_version="AES" OPENSSL_VERSION_PTEXT;

const char AES_version[]="AES" OPENSSL_VERSION_PTEXT;



const char *AES_options(void) {

#ifdef FULL_UNROLL

crypto/asn1/asn1_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 


static int asn1_get_length(unsigned char **pp,int *inf,long *rl,int max);

static void asn1_put_length(unsigned char **pp, int length);

const char *ASN1_version="ASN.1" OPENSSL_VERSION_PTEXT;

const char ASN1_version[]="ASN.1" OPENSSL_VERSION_PTEXT;



int ASN1_check_infinite_end(unsigned char **p, long len)

	{

crypto/bf/bf_ecb.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
 * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)

 */



const char *BF_version="Blowfish" OPENSSL_VERSION_PTEXT;

const char BF_version[]="Blowfish" OPENSSL_VERSION_PTEXT;



const char *BF_options(void)

	{

crypto/bn/bn_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
#include "cryptlib.h"

#include "bn_lcl.h"



const char *BN_version="Big Number" OPENSSL_VERSION_PTEXT;

const char BN_version[]="Big Number" OPENSSL_VERSION_PTEXT;



/* For a 32 bit machine

 * 2 -   4 ==  128

crypto/cast/c_ecb.c

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
#include "cast_lcl.h"

#include <openssl/opensslv.h>



const char *CAST_version="CAST" OPENSSL_VERSION_PTEXT;

const char CAST_version[]="CAST" OPENSSL_VERSION_PTEXT;



void CAST_ecb_encrypt(const unsigned char *in, unsigned char *out,

		      CAST_KEY *ks, int enc)