Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit44b4b67

Browse files
committed
use build-in PostgreSQL types instead of stdint.h types
1 parent1aded22 commit44b4b67

File tree

2 files changed

+28
-31
lines changed

2 files changed

+28
-31
lines changed

‎src/backend/storage/file/rijndael.c

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ Mean: 500 cycles = 51.2 mbits/sec
4242

4343
#include<sys/param.h>
4444
#include<string.h>
45-
#include<stdint.h>
4645

4746
#include"storage/rijndael.h"
4847

@@ -500,23 +499,23 @@ rijndael_decrypt(rijndael_ctx *ctx, const u4byte *in_blk, u4byte *out_blk)
500499
*/
501500

502501
void
503-
aes_set_key(rijndael_ctx*ctx,constuint8_t*key,unsignedkeybits,intenc)
502+
aes_set_key(rijndael_ctx*ctx,constuint8*key,unsignedkeybits,intenc)
504503
{
505-
uint32_t*k;
504+
uint32*k;
506505

507-
k= (uint32_t*)key;
506+
k= (uint32*)key;
508507
rijndael_set_key(ctx,k,keybits,enc);
509508
}
510509

511510
void
512-
aes_ecb_encrypt(rijndael_ctx*ctx,uint8_t*data,unsignedlen)
511+
aes_ecb_encrypt(rijndael_ctx*ctx,uint8*data,unsignedlen)
513512
{
514513
unsignedbs=16;
515-
uint32_t*d;
514+
uint32*d;
516515

517516
while (len >=bs)
518517
{
519-
d= (uint32_t*)data;
518+
d= (uint32*)data;
520519
rijndael_encrypt(ctx,d,d);
521520

522521
len-=bs;
@@ -525,14 +524,14 @@ aes_ecb_encrypt(rijndael_ctx *ctx, uint8_t *data, unsigned len)
525524
}
526525

527526
void
528-
aes_ecb_decrypt(rijndael_ctx*ctx,uint8_t*data,unsignedlen)
527+
aes_ecb_decrypt(rijndael_ctx*ctx,uint8*data,unsignedlen)
529528
{
530529
unsignedbs=16;
531-
uint32_t*d;
530+
uint32*d;
532531

533532
while (len >=bs)
534533
{
535-
d= (uint32_t*)data;
534+
d= (uint32*)data;
536535
rijndael_decrypt(ctx,d,d);
537536

538537
len-=bs;
@@ -541,10 +540,10 @@ aes_ecb_decrypt(rijndael_ctx *ctx, uint8_t *data, unsigned len)
541540
}
542541

543542
void
544-
aes_cbc_encrypt(rijndael_ctx*ctx,uint8_t*iva,uint8_t*data,unsignedlen)
543+
aes_cbc_encrypt(rijndael_ctx*ctx,uint8*iva,uint8*data,unsignedlen)
545544
{
546-
uint32_t*iv= (uint32_t*)iva;
547-
uint32_t*d= (uint32_t*)data;
545+
uint32*iv= (uint32*)iva;
546+
uint32*d= (uint32*)data;
548547
unsignedbs=16;
549548

550549
while (len >=bs)
@@ -563,11 +562,11 @@ aes_cbc_encrypt(rijndael_ctx *ctx, uint8_t *iva, uint8_t *data, unsigned len)
563562
}
564563

565564
void
566-
aes_cbc_decrypt(rijndael_ctx*ctx,uint8_t*iva,uint8_t*data,unsignedlen)
565+
aes_cbc_decrypt(rijndael_ctx*ctx,uint8*iva,uint8*data,unsignedlen)
567566
{
568-
uint32_t*d= (uint32_t*)data;
567+
uint32*d= (uint32*)data;
569568
unsignedbs=16;
570-
uint32_tbuf[4],
569+
uint32buf[4],
571570
iv[4];
572571

573572
memcpy(iv,iva,bs);
@@ -604,7 +603,7 @@ aes_cbc_decrypt(rijndael_ctx *ctx, uint8_t *iva, uint8_t *data, unsigned len)
604603
#ifdefPRINT_TABS
605604

606605
staticvoid
607-
show256u8(char*name,uint8_t*data)
606+
show256u8(char*name,uint8*data)
608607
{
609608
inti;
610609

@@ -620,7 +619,7 @@ show256u8(char *name, uint8_t *data)
620619

621620

622621
staticvoid
623-
show4x256u32(char*name,uint32_tdata[4][256])
622+
show4x256u32(char*name,uint32data[4][256])
624623
{
625624
inti,
626625
j;

‎src/include/storage/rijndael.h

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@
2020
#ifndef_RIJNDAEL_H_
2121
#define_RIJNDAEL_H_
2222

23-
#include<stdint.h>
24-
2523
/* 1. Standard types for AES cryptography source code*/
2624

27-
typedefuint8_tu1byte;/* an 8 bit unsigned character type */
28-
typedefuint16_tu2byte;/* a 16 bit unsigned integer type*/
29-
typedefuint32_tu4byte;/* a 32 bit unsigned integer type*/
25+
typedefuint8u1byte;/* an 8 bit unsigned character type */
26+
typedefuint16u2byte;/* a 16 bit unsigned integer type*/
27+
typedefuint32u4byte;/* a 32 bit unsigned integer type*/
3028

31-
typedefint8_ts1byte;/* an 8 bit signed character type*/
32-
typedefint16_ts2byte;/* a 16 bit signed integer type*/
33-
typedefint32_ts4byte;/* a 32 bit signed integer type*/
29+
typedefint8s1byte;/* an 8 bit signed character type*/
30+
typedefint16s2byte;/* a 16 bit signed integer type*/
31+
typedefint32s4byte;/* a 32 bit signed integer type*/
3432

3533
typedefstruct_rijndael_ctx
3634
{
@@ -53,10 +51,10 @@ voidrijndael_decrypt(rijndael_ctx *, const u4byte *, u4byte *);
5351

5452
/* conventional interface */
5553

56-
voidaes_set_key(rijndael_ctx*ctx,constuint8_t*key,unsignedkeybits,intenc);
57-
voidaes_ecb_encrypt(rijndael_ctx*ctx,uint8_t*data,unsignedlen);
58-
voidaes_ecb_decrypt(rijndael_ctx*ctx,uint8_t*data,unsignedlen);
59-
voidaes_cbc_encrypt(rijndael_ctx*ctx,uint8_t*iva,uint8_t*data,unsignedlen);
60-
voidaes_cbc_decrypt(rijndael_ctx*ctx,uint8_t*iva,uint8_t*data,unsignedlen);
54+
voidaes_set_key(rijndael_ctx*ctx,constuint8*key,unsignedkeybits,intenc);
55+
voidaes_ecb_encrypt(rijndael_ctx*ctx,uint8*data,unsignedlen);
56+
voidaes_ecb_decrypt(rijndael_ctx*ctx,uint8*data,unsignedlen);
57+
voidaes_cbc_encrypt(rijndael_ctx*ctx,uint8*iva,uint8*data,unsignedlen);
58+
voidaes_cbc_decrypt(rijndael_ctx*ctx,uint8*iva,uint8*data,unsignedlen);
6159

6260
#endif/* _RIJNDAEL_H_ */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp