Commit 0f97a121 authored by Rob Percival's avatar Rob Percival Committed by Rich Salz
Browse files

Move macros for reading/writing integers into ct_locl.h 



Reviewed-by: default avatarBen Laurie <ben@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 0dfd6cf9

crypto/ct/ct_b64.c

+1 −8
Original line number Diff line number Diff line
@@ -63,14 +63,7 @@ 
#include <openssl/err.h>

#include <openssl/evp.h>



/*

 * TODO(robpercival): These macros are getting duplicated all over the place.

 * Is there a single place they should be defined for re-use?

 * Also, is there a good reason they aren't functions?

 */

#define n2s(c,s) ((s=(((unsigned int)((c)[0]))<<8) | \

                     (((unsigned int)((c)[1])))), \

                  c+=2)

#include "ct_locl.h"



/*

 * Decodes the base64 string |in| into |out|.

crypto/ct/ct_locl.h

+32 −0
Original line number Diff line number Diff line
@@ -68,6 +68,38 @@ 
# define MAX_SCT_SIZE            65535

# define MAX_SCT_LIST_SIZE       MAX_SCT_SIZE



/*

 * Macros to read and write integers in network-byte order.

 */



#define n2s(c,s)        ((s=(((unsigned int)((c)[0]))<< 8)| \

                            (((unsigned int)((c)[1]))    )),c+=2)



#define s2n(s,c)        ((c[0]=(unsigned char)(((s)>> 8)&0xff), \

                          c[1]=(unsigned char)(((s)    )&0xff)),c+=2)



#define l2n3(l,c)       ((c[0]=(unsigned char)(((l)>>16)&0xff), \

                          c[1]=(unsigned char)(((l)>> 8)&0xff), \

                          c[2]=(unsigned char)(((l)    )&0xff)),c+=3)



#define n2l8(c,l)       (l =((uint64_t)(*((c)++)))<<56, \

                         l|=((uint64_t)(*((c)++)))<<48, \

                         l|=((uint64_t)(*((c)++)))<<40, \

                         l|=((uint64_t)(*((c)++)))<<32, \

                         l|=((uint64_t)(*((c)++)))<<24, \

                         l|=((uint64_t)(*((c)++)))<<16, \

                         l|=((uint64_t)(*((c)++)))<< 8, \

                         l|=((uint64_t)(*((c)++))))



#define l2n8(l,c)       (*((c)++)=(unsigned char)(((l)>>56)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>48)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>40)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>32)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>24)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>16)&0xff), \

                         *((c)++)=(unsigned char)(((l)>> 8)&0xff), \

                         *((c)++)=(unsigned char)(((l)    )&0xff))



/* Signed Certificate Timestamp */

struct sct_st {

    sct_version_t version;

crypto/ct/ct_vfy.c

+0 −28
Original line number Diff line number Diff line
@@ -65,34 +65,6 @@ 


#include "ct_locl.h"



#define n2s(c,s)        ((s=(((unsigned int)((c)[0]))<< 8)| \

                            (((unsigned int)((c)[1]))    )),c+=2)



#define s2n(s,c)        ((c[0]=(unsigned char)(((s)>> 8)&0xff), \

                          c[1]=(unsigned char)(((s)    )&0xff)),c+=2)



#define l2n3(l,c)       ((c[0]=(unsigned char)(((l)>>16)&0xff), \

                          c[1]=(unsigned char)(((l)>> 8)&0xff), \

                          c[2]=(unsigned char)(((l)    )&0xff)),c+=3)



#define n2l8(c,l)       (l =((uint64_t)(*((c)++)))<<56, \

                         l|=((uint64_t)(*((c)++)))<<48, \

                         l|=((uint64_t)(*((c)++)))<<40, \

                         l|=((uint64_t)(*((c)++)))<<32, \

                         l|=((uint64_t)(*((c)++)))<<24, \

                         l|=((uint64_t)(*((c)++)))<<16, \

                         l|=((uint64_t)(*((c)++)))<< 8, \

                         l|=((uint64_t)(*((c)++))))



#define l2n8(l,c)       (*((c)++)=(unsigned char)(((l)>>56)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>48)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>40)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>32)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>24)&0xff), \

                         *((c)++)=(unsigned char)(((l)>>16)&0xff), \

                         *((c)++)=(unsigned char)(((l)>> 8)&0xff), \

                         *((c)++)=(unsigned char)(((l)    )&0xff))



typedef enum sct_signature_type_t {

    SIGNATURE_TYPE_NOT_SET = -1,

    SIGNATURE_TYPE_CERT_TIMESTAMP,