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

Make bio_ok.c 64-bit savvy.

Browse source
This commit is contained in:
Andy Polyakov 2004-07-25 19:37:41 +00:00
parent 6f86850eec
commit 3205db2bfe
1 changed files with 22 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
crypto/evp/bio_ok.c
View file

@ -119,6 +119,7 @@
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>
#include <assert.h>
#include "cryptlib.h" #include "cryptlib.h"
#include <openssl/buffer.h> #include <openssl/buffer.h>
#include <openssl/bio.h> #include <openssl/bio.h>
@ -141,16 +142,6 @@ static void block_in(BIO* b);
#define IOBS (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE) #define IOBS (OK_BLOCK_SIZE+ OK_BLOCK_BLOCK+ 3*EVP_MAX_MD_SIZE)
#define WELLKNOWN "The quick brown fox jumped over the lazy dog's back." #define WELLKNOWN "The quick brown fox jumped over the lazy dog's back."
#ifndef L_ENDIAN
#define swapem(x) \
((unsigned long int)((((unsigned long int)(x) & 0x000000ffU) << 24) | \
(((unsigned long int)(x) & 0x0000ff00U) << 8) | \
(((unsigned long int)(x) & 0x00ff0000U) >> 8) | \
(((unsigned long int)(x) & 0xff000000U) >> 24)))
#else
#define swapem(x) (x)
#endif
typedef struct ok_struct typedef struct ok_struct
{ {
int buf_len; int buf_len;
@ -448,16 +439,18 @@ static long ok_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
return(ret); return(ret);
} }
static void longswap(void *_ptr, int len) static void longswap(void *_ptr, size_t len)
{ { const union { long one; char little; } is_endian = {1};
#ifndef L_ENDIAN
int i;
char *ptr=_ptr;
for(i= 0;i < len;i+= 4){ if (is_endian.little) {
*((unsigned long *)&(ptr[i]))= swapem(*((unsigned long *)&(ptr[i]))); size_t i;
unsigned char *p=_ptr,c;
for(i= 0;i < len;i+= 4) {
c=p[0],p[0]=p[3],p[3]=c;
c=p[1],p[1]=p[2],p[2]=c;
}
} }
#endif
} }
static void sig_out(BIO* b) static void sig_out(BIO* b)
@ -533,9 +526,10 @@ static void block_out(BIO* b)
md=&ctx->md; md=&ctx->md;
tl= ctx->buf_len- OK_BLOCK_BLOCK; tl= ctx->buf_len- OK_BLOCK_BLOCK;
tl= swapem(tl); ctx->buf[0]=(unsigned char)(tl>>24);
memcpy(ctx->buf, &tl, OK_BLOCK_BLOCK); ctx->buf[1]=(unsigned char)(tl>>16);
tl= swapem(tl); ctx->buf[2]=(unsigned char)(tl>>8);
ctx->buf[3]=(unsigned char)(tl);
EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl); EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);
EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL); EVP_DigestFinal_ex(md, &(ctx->buf[ctx->buf_len]), NULL);
ctx->buf_len+= md->digest->md_size; ctx->buf_len+= md->digest->md_size;
@ -546,14 +540,18 @@ static void block_in(BIO* b)
{ {
BIO_OK_CTX *ctx; BIO_OK_CTX *ctx;
EVP_MD_CTX *md; EVP_MD_CTX *md;
long tl= 0; unsigned long tl= 0;
unsigned char tmp[EVP_MAX_MD_SIZE]; unsigned char tmp[EVP_MAX_MD_SIZE];
ctx=b->ptr; ctx=b->ptr;
md=&ctx->md; md=&ctx->md;
memcpy(&tl, ctx->buf, OK_BLOCK_BLOCK); assert(sizeof(tl)>=OK_BLOCK_BLOCK); /* always true */
tl= swapem(tl); tl =ctx->buf[0]; tl<<=8;
tl|=ctx->buf[1]; tl<<=8;
tl|=ctx->buf[2]; tl<<=8;
tl|=ctx->buf[3];
if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return; if (ctx->buf_len < tl+ OK_BLOCK_BLOCK+ md->digest->md_size) return;
EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl); EVP_DigestUpdate(md, (unsigned char*) &(ctx->buf[OK_BLOCK_BLOCK]), tl);