Sophie

Sophie

distrib > Mageia > 5 > x86_64 > by-pkgid > 6bbd4e4fa0b08780bcfb4590462eebbb > files > 10

nss-3.28.6-1.2.mga5.src.rpm


# HG changeset patch
# User Petr Cerny <pcerny@suse.cz>
# Date 1490007987 -3600
# Node ID 0dca14409fefa9090db2a382d2dbfdc6d800852e
# Parent  42d76657dc9501e520514a69c464bee9377ce49c
Bug 1348767 - use bitwise or, r=franziskus

diff --git a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
--- a/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
+++ b/lib/libpkix/pkix_pl_nss/pki/pkix_pl_ocsprequest.c
@@ -84,18 +84,18 @@ pkix_pl_OcspRequest_Hashcode(
 
         if (ocspRq->addServiceLocator == PKIX_TRUE) {
                 extensionHash = 0xff;
         }
 
         PKIX_HASHCODE(ocspRq->signerCert, &signerHash, plContext,
                 PKIX_CERTHASHCODEFAILED);
 
-        *pHashcode = (((((extensionHash << 8) || certHash) << 8) ||
-                dateHash) << 8) || signerHash;
+        *pHashcode = (((((extensionHash << 8) | certHash) << 8) |
+                dateHash) << 8) | signerHash;
 
 cleanup:
 
         PKIX_RETURN(OCSPREQUEST);
 
 }
 
 /*