From e0520c65d51238c9630f3d9484049155186c744e Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Tue, 25 Feb 2014 15:05:08 +0000 Subject: [PATCH] Don't use BN_ULLONG in n2l8 use SCTS_TIMESTAMP. (cherry picked from commit 3678161d717d0f46c5b5b052a6d6a33438b1df00) --- crypto/x509v3/v3_scts.c | 9 +++++++++ ssl/ssl_locl.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c index 614522a75e..457d5acaaa 100644 --- a/crypto/x509v3/v3_scts.c +++ b/crypto/x509v3/v3_scts.c @@ -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); diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 8f47795d86..1a2aef70e4 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -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; \ -- 2.34.1