Don't use BN_ULLONG in n2l8 use SCTS_TIMESTAMP.
authorDr. Stephen Henson <steve@openssl.org>
Tue, 25 Feb 2014 15:05:08 +0000 (15:05 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Tue, 25 Feb 2014 15:06:51 +0000 (15:06 +0000)
(cherry picked from commit 3678161d717d0f46c5b5b052a6d6a33438b1df00)

crypto/x509v3/v3_scts.c
ssl/ssl_locl.h

index 614522a..457d5ac 100644 (file)
 #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);
 
index 8f47795..1a2aef7 100644 (file)
                         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; \