[openssl-commits] [openssl] master update

[Matt Caswell]

The branch master has been updated
       via  d2a0d72f33e2cd81a5c81b29b05d6fdb2cc67ac2 (commit)
       via  a8fe430a0d1ece596e66f27e09dc63ca19a2e2d6 (commit)
      from  004efdbb41f731d36bf12d251909aaa08704a756 (commit)


- Log -----------------------------------------------------------------
commit d2a0d72f33e2cd81a5c81b29b05d6fdb2cc67ac2
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jan 22 11:04:47 2015 +0000

    Fix post-reformat errors preventing windows compilation
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>

commit a8fe430a0d1ece596e66f27e09dc63ca19a2e2d6
Author: Matt Caswell <matt at openssl.org>
Date:   Thu Jan 22 10:42:48 2015 +0000

    Fix formatting error in pem.h
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_dgram.c |    2 +-
 crypto/pem/pem.h       |   18 ++++++++++++------
 ssl/d1_lib.c           |    2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/crypto/bio/bss_dgram.c b/crypto/bio/bss_dgram.c
index 78c437b..885b969 100644
--- a/crypto/bio/bss_dgram.c
+++ b/crypto/bio/bss_dgram.c
@@ -2055,7 +2055,7 @@ static void get_current_time(struct timeval *t)
 #  ifdef  __MINGW32__
     now.ul -= 116444736000000000ULL;
 #  else
-    now.ul -= 116444736000000000U I64; /* re-bias to 1/1/1970 */
+    now.ul -= 116444736000000000UI64; /* re-bias to 1/1/1970 */
 #  endif
     t->tv_sec = (long)(now.ul / 10000000);
     t->tv_usec = ((int)(now.ul % 10000000)) / 10;
diff --git a/crypto/pem/pem.h b/crypto/pem/pem.h
index 9aa99be..848649d 100644
--- a/crypto/pem/pem.h
+++ b/crypto/pem/pem.h
@@ -452,7 +452,8 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str);
 DECLARE_PEM_rw(X509, X509)
 DECLARE_PEM_rw(X509_AUX, X509)
 DECLARE_PEM_rw(X509_CERT_PAIR, X509_CERT_PAIR)
-DECLARE_PEM_rw(X509_REQ, X509_REQ) DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
+DECLARE_PEM_rw(X509_REQ, X509_REQ)
+DECLARE_PEM_write(X509_REQ_NEW, X509_REQ)
 DECLARE_PEM_rw(X509_CRL, X509_CRL)
 DECLARE_PEM_rw(PKCS7, PKCS7)
 DECLARE_PEM_rw(NETSCAPE_CERT_SEQUENCE, NETSCAPE_CERT_SEQUENCE)
@@ -460,20 +461,25 @@ DECLARE_PEM_rw(PKCS8, X509_SIG)
 DECLARE_PEM_rw(PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO)
 # ifndef OPENSSL_NO_RSA
 DECLARE_PEM_rw_cb(RSAPrivateKey, RSA)
-DECLARE_PEM_rw_const(RSAPublicKey, RSA) DECLARE_PEM_rw(RSA_PUBKEY, RSA)
+DECLARE_PEM_rw_const(RSAPublicKey, RSA)
+DECLARE_PEM_rw(RSA_PUBKEY, RSA)
 # endif
 # ifndef OPENSSL_NO_DSA
 DECLARE_PEM_rw_cb(DSAPrivateKey, DSA)
-DECLARE_PEM_rw(DSA_PUBKEY, DSA) DECLARE_PEM_rw_const(DSAparams, DSA)
+DECLARE_PEM_rw(DSA_PUBKEY, DSA)
+DECLARE_PEM_rw_const(DSAparams, DSA)
 # endif
 # ifndef OPENSSL_NO_EC
 DECLARE_PEM_rw_const(ECPKParameters, EC_GROUP)
-DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY) DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)
+DECLARE_PEM_rw_cb(ECPrivateKey, EC_KEY)
+DECLARE_PEM_rw(EC_PUBKEY, EC_KEY)
 # endif
 # ifndef OPENSSL_NO_DH
-DECLARE_PEM_rw_const(DHparams, DH) DECLARE_PEM_write_const(DHxparams, DH)
+DECLARE_PEM_rw_const(DHparams, DH)
+DECLARE_PEM_write_const(DHxparams, DH)
 # endif
-DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY) DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
+DECLARE_PEM_rw_cb(PrivateKey, EVP_PKEY)
+DECLARE_PEM_rw(PUBKEY, EVP_PKEY)
 
 int PEM_write_bio_PKCS8PrivateKey_nid(BIO *bp, EVP_PKEY *x, int nid,
                                       char *kstr, int klen,
diff --git a/ssl/d1_lib.c b/ssl/d1_lib.c
index e75d049..4ca6bb3 100644
--- a/ssl/d1_lib.c
+++ b/ssl/d1_lib.c
@@ -528,7 +528,7 @@ static void get_current_time(struct timeval *t)
 # ifdef  __MINGW32__
     now.ul -= 116444736000000000ULL;
 # else
-    now.ul -= 116444736000000000U I64; /* re-bias to 1/1/1970 */
+    now.ul -= 116444736000000000UI64; /* re-bias to 1/1/1970 */
 # endif
     t->tv_sec = (long)(now.ul / 10000000);
     t->tv_usec = ((int)(now.ul % 10000000)) / 10;