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

Don't use BN_ULLONG in n2l8 use SCTS_TIMESTAMP. 

(cherry picked from commit 3678161d)
parent 3a325c60

crypto/x509v3/v3_scts.c

+9 −0
Original line number Diff line number Diff line
@@ -71,6 +71,15 @@ 
#define SCTS_TIMESTAMP unsigned long long

#endif



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

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

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

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

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

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

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

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





static int i2r_scts(X509V3_EXT_METHOD *method, ASN1_OCTET_STRING *oct, BIO *out, int indent);

ssl/ssl_locl.h

+0 −9
Original line number Diff line number Diff line
@@ -231,15 +231,6 @@ 
			 l|=((BN_ULLONG)(*((c)++)))<< 8, \

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



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

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

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

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

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

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

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

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



/* NOTE - c is not incremented as per l2c */

#define l2cn(l1,l2,c,n)	{ \

			c+=n; \