Commit Graph

1308 Commits

Author SHA1 Message Date
Wan-Teh Chang
17e3ffcd87 Bug 881841: Update Mozilla to use NSS 3.15.1. 2013-08-01 15:59:00 -07:00
Wan-Teh Chang
e0d34d10b5 Bug 713933: Add the NSS patch for this bug (rather than the PSM patch
for bug 658222) to security/patches.
2013-08-01 15:49:16 -07:00
Yoshi Huang
e48ec3affe Bug 899946 - strange call to crypto.generateCRMFRequest from test_bug882865.html. r=Ms2ger 2013-07-31 18:34:14 +08:00
Ehsan Akhgari
5ee21d6d3f Bug 895322 - Part 1: Replace the usages of MOZ_STATIC_ASSERT with C++11 static_assert; r=Waldo
This patch was mostly generated by running the following scripts on the codebase, with some
manual changes made afterwards:

# static_assert.sh
#!/bin/bash
# Command to convert an NSPR integer type to the equivalent standard integer type

function convert() {
echo "Converting $1 to $2..."
find . ! -wholename "*nsprpub*" \
       ! -wholename "*security/nss*" \
       ! -wholename "*/.hg*" \
       ! -wholename "obj-ff-dbg*" \
       ! -name nsXPCOMCID.h \
       ! -name prtypes.h \
         -type f \
      \( -iname "*.cpp" \
         -o -iname "*.h" \
         -o -iname "*.cc" \
         -o -iname "*.mm" \) | \
    xargs -n 1 `dirname $0`/assert_replacer.py #sed -i -e "s/\b$1\b/$2/g"
}

convert MOZ_STATIC_ASSERT static_assert
hg rev --no-backup mfbt/Assertions.h \
                   media/webrtc/signaling/src/sipcc/core/includes/ccapi.h \
                   modules/libmar/src/mar_private.h \
                   modules/libmar/src/mar.h


# assert_replacer.py
#!/usr/bin/python

import sys
import re

pattern = re.compile(r"\bMOZ_STATIC_ASSERT\b")

def replaceInPlace(fname):
  print fname
  f = open(fname, "rw+")
  lines = f.readlines()
  for i in range(0, len(lines)):
    while True:
      index = re.search(pattern, lines[i])
      if index != None:
        index = index.start()
        lines[i] = lines[i][0:index] + "static_assert" + lines[i][index+len("MOZ_STATIC_ASSERT"):]
        for j in range(i + 1, len(lines)):
          if lines[j].find("                 ", index) == index:
            lines[j] = lines[j][0:index] + lines[j][index+4:]
          else:
            break
      else:
        break
  f.seek(0, 0)
  f.truncate()
  f.write("".join(lines))
  f.close()

argc = len(sys.argv)
for i in range(1, argc):
  replaceInPlace(sys.argv[i])

--HG--
extra : rebase_source : 4b4a4047d82f2c205b9fad8d56dfc3f1afc0b045
2013-07-18 13:59:53 -04:00
Ehsan Akhgari
9854ac6166 Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted 2013-07-30 10:25:31 -04:00
Bobby Holley
c00f6379ec Bug 899245 - Rename JS_GetGlobalForScopeChain to JS::CurrentGlobalOrNull. r=luke
This was done with perl/grep.
2013-07-29 16:45:27 -07:00
Adrian Lungu
5e03b65bf5 Bug 887984 - Send telemetry data from NTLM Init() methods. r=honzab 2013-07-25 09:54:11 -07:00
Trevor Saunders
6b3c839046 backout bug 886526 because it probably made us use a lot more memory to link on windows 2013-07-29 11:03:21 -04:00
Olli Pettay
5ebee36665 Bug 892588 - crash in nsNSSASN1Sequence::~nsNSSASN1Sequence, r=bsmith
--HG--
extra : rebase_source : a3d1a29f0ebcfb05462be3a46b38b7be08163379
2013-07-29 19:46:52 +03:00
ffxbld
264abea880 No bug, Automated HSTS preload list update from host bld-linux64-ec2-489 - a=hsts-update 2013-07-27 03:17:36 -07:00
David Keeler
2e45a9aaf4 bug 846825 - refactor, make HSTS header parser more spec-conformant r=cviecco r=grobinson 2013-07-25 16:13:50 -07:00
Joshua Cranmer
de65691b85 Bug 884061 - Part 3s: Use NS_DECL_THREADSAFE_ISUPPORTS in security/, r=bsmith
--HG--
extra : rebase_source : 2b3329c361a71c49ef7c0793006c7dbb6f855e28
2013-07-18 21:24:14 -05:00
Cameron McCormack
d12c9b52c0 Backout bdceed703766 (bug 887984) for Windows build failures. 2013-07-23 13:43:45 +10:00
Adrian Lungu
8972a584c5 Bug 887984 - Send telemetry data from NTLM Init() methods. r=mayhemer 2013-07-18 12:00:04 -07:00
Ed Morley
3d41b8763b Merge latest green inbound changeset and mozilla-central 2013-07-22 14:45:43 +01:00
ffxbld
cc6e750a6a No bug, Automated HSTS preload list update from host bld-linux64-ec2-397 - a=hsts-update 2013-07-20 03:37:24 -07:00
David Keeler
372e88a5ab bug 882865 - cryptojs key gen cleanup: use EqualsLiteral() r=bsmith r=Ms2ger r=khuey 2013-07-12 10:00:22 -07:00
David Keeler
49010bf129 bug 892017 - fix incorrect usage of PLArenaPool in OCSPStaplingServer r=bsmith 2013-07-19 11:54:10 -07:00
David Keeler
7ffd612afa Back out a5a5d2c176f7 (bug 882865) because of Android test failures on a CLOSED TREE 2013-07-18 15:55:10 -07:00
David Keeler
3b48f89fba bug 882865 - cryptojs key gen cleanup: use EqualsLiteral() r=bsmith r=Ms2ger 2013-07-12 10:00:22 -07:00
Camilo Viecco
2d31d4e2d3 Bug 883682: Enable EV test cert only in debug builds. r=bsmith
--HG--
extra : rebase_source : 0f14273c6f6d4da4164d7beeb3fd21bd6def1fd0
2013-07-03 08:24:09 -07:00
Ed Morley
58d740e5a9 Merge latest green inbound changeset and mozilla-central 2013-07-15 10:48:54 +01:00
ffxbld
001a9a5108 No bug, Automated HSTS preload list update from host bld-centos6-hp-017 - a=hsts-update 2013-07-13 03:11:47 -07:00
Johnny Stenback
2ac1598ef4 Bug 893290 - Fix busted error reporting in ssl code. r=dougt 2013-07-13 07:35:30 -07:00
Kai Engert
42d3559e40 Bug 531067: Remove hard-coded default OCSP responders on trunk, r=briansmith
--HG--
extra : rebase_source : 23bc45569bba9f417a51c13530f0319144f07b03
2013-07-11 23:33:55 -07:00
David Keeler
5b43228ed9 bug 889831 - always call SSL_PeerStapledOCSPResponses r=bsmith 2013-07-08 14:56:08 -07:00
Brian Smith
6964de8aed Bug 820887: Fix early return in HandshakeCallback, r=keeler
--HG--
extra : rebase_source : e60d86d2b796bda0d44fe640663261cbebede495
2013-05-15 14:32:03 -07:00
Emanuel Hoogeveen
a278970cd3 Bug 890714 - Fix mixed line endings. r=joe, r=jesup 2013-07-08 16:33:15 -04:00
Josh Matthews
3847f5bbf0 Bug 889885 - Avoid releasing scripted observers from PSM off the main thread. r=bsmith 2013-07-08 13:43:31 -04:00
Trevor Saunders
6be251fe42 bug 886526 - disallow MODULE_NAME and IS_COMPONENT for makefiles in libxul r=bsmedberg 2013-06-25 11:15:21 -04:00
Ehsan Akhgari
c511873558 Bug 886183 - Remove three unused functions from nsIdentityChecking.cpp; r=bsmith 2013-07-08 07:11:08 -04:00
ffxbld
6f6a11e51b No bug, Automated HSTS preload list update from host bld-linux64-ix-019 - a=hsts-update 2013-07-06 03:26:18 -07:00
Ryan VanderMeulen
f203259101 Merge m-c and inbound. 2013-07-03 16:39:33 -04:00
ffxbld
14f6c77441 No bug, Automated HSTS preload list update from host bld-linux64-ec2-324 - a=hsts-update 2013-07-03 12:25:37 -07:00
Masatoshi Kimura
176efd0f7c Bug 888323 - Stop including prtime.h in nsrootidl.idl. r=ehsan 2013-07-04 00:56:26 +09:00
Patrick McManus
9c44286c03 bug 658222 - Enable TLS False Start (PSM) r=bsmith
--HG--
extra : rebase_source : ac9f77ba73a0a902f4b6aa8d52add7d52efb1b53
2013-06-28 16:58:28 -04:00
Patrick McManus
4bb2b60348 Bug 713933: Make false start work with asynchronous certificate verification, r=bsmith
--HG--
extra : rebase_source : b895a399e381996f7e55d06f94a684469e287b8d
2013-06-30 22:23:16 -07:00
Justin Lebar
6c46d0633d Bug 820686 - Remove code after MOZ_CRASH or MOZ_ASSUME_NOT_REACHED. r=(see below)
r=tbsaunde for accessible
r=jmuizelaar for gfx
r=waldo for js
r=roc for layout
r=glandium for mozglue
r=jduell for netwerk
r=khuey for everything else
2013-06-28 18:38:32 -07:00
Justin Lebar
75c400493b Bug 802686 - s/MOZ_NOT_REACHED/MOZ_CRASH/ in Gecko. r=(see below)
r=tbsaunde for accessible
r=jmuizelaar for gfx
r=roc for layout
r=glandium for mozglue
r=jduell for netwerk
r=khuey for everything else

This is a mechanical change made with sed.  Later patches in this queue
clean up the whitespace errors and so on.
2013-06-28 18:38:30 -07:00
Ryan VanderMeulen
0d9d01968b Backed out changeset d155557b651c (bug 888323) for bustage.
CLOSED TREE
2013-07-02 14:15:39 -04:00
Masatoshi Kimura
b75e2ac8e6 Bug 888323 - Stop including prtime.h in nsrootidl.idl. r=ehsan 2013-07-03 02:08:01 +09:00
Nathan Froyd
37897413c5 Bug 857076: fix various build warnings in security/manager/ssl/src/, r=bsmith
--HG--
extra : rebase_source : 3287d494065dfeb5b178c6801b83ac400ca6ef06
2013-06-24 00:57:51 -07:00
David Keeler
dd6c34c30d bug 700693 - fix ocsp stapling test timeouts r=bsmith 2013-06-21 15:15:27 -07:00
David Keeler
ad7bcb2bf7 bug 700693 - OCSP stapling testing r=bsmith 2013-06-20 11:41:41 -07:00
David Keeler
cc2926b0a1 bug 700693 - OCSP stapling PSM changes r=bsmith 2013-06-17 16:45:49 -07:00
Ehsan Akhgari
9c3393692c Remove two unused variables in nsNSSCertificateDB.cpp, no bug 2013-06-23 20:24:03 -04:00
Brian Smith
a0b411af4b Bug 879137, Part 3: Move PSMContentListener to its own source file, r=keeler 2013-06-22 15:57:15 -07:00
Brian Smith
b4541942c3 Bug 879137, Part 2: Remove unnecessary manual registration of PSM content listeners, r=keeler 2013-06-22 15:53:46 -07:00
Brian Smith
59685570e0 Bug 867465: Remove the "Revocation Lists" feature, r=cviecco, r=mattn 2013-06-02 23:37:47 -07:00
Brian Smith
7f270022df Backout 308e3cd73c5f, cc9980cb3db2, f5591bedc40e due to build failure 2013-06-22 16:45:47 -07:00