Commit Graph

1186 Commits

Author SHA1 Message Date
Ryan VanderMeulen
fc58488cf2 Merge m-c to inbound on a CLOSED TREE. 2013-08-19 17:05:12 -04:00
Paolo Amadini
196312742f Bug 847863 - Part 5 of 8 - Selectively convert mixed content blocker tests. r=enn 2013-08-19 17:23:59 +02:00
Cykesiopka
8a584f3c4a Bug 825583 - Remove server tab cert trust editing. r=keeler 2013-08-19 08:48:08 -04:00
ffxbld
7b496ac10e No bug, Automated HSTS preload list update from host bld-centos6-hp-008 - a=hsts-update 2013-08-17 03:12:53 -07:00
David Keeler
e10f525bd1 bug 903762 - be more strict about removing HSTS preload list entries r=cviecco 2013-08-15 15:48:39 -07:00
Trevor Saunders
86d20580f1 bug 905410 - remove most remaining usage of nspr atomics outside of xpcom/ r=ehsan 2013-08-12 05:51:49 -04:00
Ms2ger
3d504dcb66 Merge latest PGO-green inbounc changeset to m-c. 2013-08-14 14:45:47 +02:00
Ms2ger
4579943f93 Bug 897909 - Cleanup some SIMPLE_PROGRAMS; r=gps
* * *
FOLD
2013-08-14 09:00:13 +02:00
Camilo Viecco
cbc8c9da06 Bug 902511 - Batch of EV certs for August (augments struct in nsIdentityInfo). r=honzab 2013-08-13 22:21:20 -07:00
Boris Zbarsky
5d344b2eb3 Back out revision ea0f2d537a40 (bug 903283) because Windows was bootlegging nsRegion.h via EventTarget.h in widget code and so we ended up with a CLOSED TREE. 2013-08-09 22:31:05 -04:00
David Zbarsky
d73e74f40e Bug 903283: Don't include EventTarget.h in headers r=Ms2ger 2013-08-09 21:17:52 -04:00
David Zbarsky
46c6e64d77 Bug 903283: Don't include EventTarget.h in headers r=Ms2ger 2013-08-19 06:15:55 -04:00
Trevor Saunders
b2dc01f1a7 bug 886526 - remove IS_COMPONENT and MODULE_NAME makefile vars for things in libxul r=bsmedberg r=glandium 2013-08-08 20:12:37 -04:00
Nicholas Nethercote
849635b8f1 Bug 898914 (part 1) - Remove JSBool.
--HG--
extra : rebase_source : 2d202e0e5005a7f54724b1540481c15cde3ad52e
2013-08-08 15:53:04 -07:00
David Dahl
98f42a7f2a Bug 824652 - crypto.generateCRMFRequest bypasses CSP (allows script execution from a string, without unsafe-eval) r=bsmith r=khuey r=keeler 2013-08-06 21:46:05 -05:00
Ryan VanderMeulen
6e225374e2 Backed out changeset a4dd0dc4e354 (bug 824652) for Android M1 orange. 2013-08-05 19:21:17 -04:00
David Keeler
f6f47c149c bug 887052 - refactor nsISiteSecurityService for multiple headers r=cviecco r=mcmanus r=jst sr=jst 2013-08-02 16:23:18 -07:00
David Keeler
e02475356e bug 887052 - rename nsIStrictTransportSecurityService to nsISiteSecurityService for refactoring r=cviecco r=mcmanus r=jst sr=jst
--HG--
rename : netwerk/base/public/nsIStrictTransportSecurityService.idl => netwerk/base/public/nsISiteSecurityService.idl
rename : security/manager/boot/src/nsStrictTransportSecurityService.cpp => security/manager/boot/src/nsSiteSecurityService.cpp
rename : security/manager/boot/src/nsStrictTransportSecurityService.h => security/manager/boot/src/nsSiteSecurityService.h
2013-08-02 15:48:37 -07:00
David Dahl
99b75a0ff8 Bug 824652 - crypto.generateCRMFRequest bypasses CSP (allows script execution from a string, without unsafe-eval) r=bsmith r=khuey r=keeler 2013-08-05 16:15:22 -05:00
Ryan VanderMeulen
e91e143e66 Backed out changesets 5f8a88c6d0c8 and 97fcb5a154d8 (bug 887052) for OSX mochitest-other orange.
--HG--
rename : netwerk/base/public/nsISiteSecurityService.idl => netwerk/base/public/nsIStrictTransportSecurityService.idl
rename : security/manager/boot/src/nsSiteSecurityService.cpp => security/manager/boot/src/nsStrictTransportSecurityService.cpp
rename : security/manager/boot/src/nsSiteSecurityService.h => security/manager/boot/src/nsStrictTransportSecurityService.h
2013-08-05 16:18:06 -04:00
David Keeler
a746ca39ba bug 887052 - refactor nsISiteSecurityService for multiple headers r=cviecco r=mcmanus r=jst sr=jst 2013-07-01 10:49:40 -07:00
David Keeler
503e645f01 bug 887052 - rename nsIStrictTransportSecurityService to nsISiteSecurityService for refactoring r=cviecco r=mcmanus r=jst sr=jst
--HG--
rename : netwerk/base/public/nsIStrictTransportSecurityService.idl => netwerk/base/public/nsISiteSecurityService.idl
rename : security/manager/boot/src/nsStrictTransportSecurityService.cpp => security/manager/boot/src/nsSiteSecurityService.cpp
rename : security/manager/boot/src/nsStrictTransportSecurityService.h => security/manager/boot/src/nsSiteSecurityService.h
2013-07-01 09:30:11 -07:00
Carsten "Tomcat" Book
ce9fe7db3d Merge b2g-inbound to m-c 2013-08-05 11:22:48 +02:00
ffxbld
820a17a4a2 No bug, Automated HSTS preload list update from host bld-linux64-ec2-042 - a=hsts-update 2013-08-03 03:26:02 -07:00
Yoshi Huang
dfc815e181 Bug 883741 - Part 1: WebCrypto: Move Crypto to WebIDL. r=bz 2013-08-01 14:57:25 +08:00
Ehsan Akhgari
ed8af4cc55 Bug 579517 follow-up: Remove NSPR types that crept in 2013-08-02 12:09:54 -04:00
Yoshi Huang
44d9ef56f3 Bug 899946 - strange call to crypto.generateCRMFRequest from test_bug882865.html. r=Ms2ger 2013-07-31 18:34:14 +08:00
Ehsan Akhgari
085494b95d 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
3717325909 Bug 872127 - Part 2: Replace mozilla/StandardInteger.h with stdint.h; r=Waldo,ted 2013-07-30 10:25:31 -04:00
Bobby Holley
99246966e4 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
e9ec3b582d Bug 887984 - Send telemetry data from NTLM Init() methods. r=honzab 2013-07-25 09:54:11 -07:00
Trevor Saunders
64dbc43c4d 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
c8fafb3a30 Bug 892588 - crash in nsNSSASN1Sequence::~nsNSSASN1Sequence, r=bsmith
--HG--
extra : rebase_source : a3d1a29f0ebcfb05462be3a46b38b7be08163379
2013-07-29 19:46:52 +03:00
ffxbld
365135bace 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
5ac4ee12c2 bug 846825 - refactor, make HSTS header parser more spec-conformant r=cviecco r=grobinson 2013-07-25 16:13:50 -07:00
Joshua Cranmer
870351ab3d 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
ff401b5a0d Backout bdceed703766 (bug 887984) for Windows build failures. 2013-07-23 13:43:45 +10:00
Adrian Lungu
fc305ae760 Bug 887984 - Send telemetry data from NTLM Init() methods. r=mayhemer 2013-07-18 12:00:04 -07:00
Ed Morley
4b1f775375 Merge latest green inbound changeset and mozilla-central 2013-07-22 14:45:43 +01:00
ffxbld
67a4e2373d 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
deb959d2d8 bug 882865 - cryptojs key gen cleanup: use EqualsLiteral() r=bsmith r=Ms2ger r=khuey 2013-07-12 10:00:22 -07:00
David Keeler
968ceb3129 bug 892017 - fix incorrect usage of PLArenaPool in OCSPStaplingServer r=bsmith 2013-07-19 11:54:10 -07:00
David Keeler
0ed6a51130 Back out a5a5d2c176f7 (bug 882865) because of Android test failures on a CLOSED TREE 2013-07-18 15:55:10 -07:00
David Keeler
4b144d3500 bug 882865 - cryptojs key gen cleanup: use EqualsLiteral() r=bsmith r=Ms2ger 2013-07-12 10:00:22 -07:00
Camilo Viecco
ad1dce4f8c 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
a395627026 Merge latest green inbound changeset and mozilla-central 2013-07-15 10:48:54 +01:00
ffxbld
e5ec3d4b8f 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
a6ffcef8b9 Bug 893290 - Fix busted error reporting in ssl code. r=dougt 2013-07-13 07:35:30 -07:00
Kai Engert
85ead3feac 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
4f26e560b1 bug 889831 - always call SSL_PeerStapledOCSPResponses r=bsmith 2013-07-08 14:56:08 -07:00