Merge "Merge upstream SHA 04cb763"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release

am: 9a337512d9

* commit '9a337512d97e37afc142dee4fd50a41b741a87d2': (797 commits)
  Add tests for verifying transport feedback for audio and video.
  Eliminate defines in talk/
  Revert of Update with new default boringssl no-aes cipher suites. Re-enable tests. (patchset #3 id:40001 of https://codereview.webrtc.org/1550773002/ )
  Remove assert which was incorrectly added to TcpPort::OnSentPacket.
  Reland Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Update with new default boringssl no-aes cipher suites. Re-enable tests.
  Revert of Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (patchset #3 id:40001 of https://codereview.webrtc.org/1577873003/ )
  Re-land: "Use an explicit identifier in Config"
  Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
  Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/1586613002/ )
  Remove libfuzzer trybot from default trybot set.
  Add ramp-up tests for transport sequence number with and w/o audio.
  Delete remnants of non-square pixel support from cricket::VideoFrame.
  Fix IPAddress::ToSensitiveString() to avoid dependency on inet_ntop().
  Revert of Storing raw audio sink for default audio track. (patchset #7 id:120001 of https://codereview.chromium.org/1551813002/ )
  Re-enable tests that failed under Linux_Msan.
  Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
  Roll chromium_revision 346fea9..099be58 (369082:369139)
  Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan
  Add build_protobuf variable.
  ...

1 files changed, 190 insertions, 0 deletions

diff --git a/tools/sslroots/generate_sslroots.py b/tools/sslroots/generate_sslroots.py
new file mode 100644
index 0000000000..65751f1f1a
--- /dev/null
+++ b/tools/sslroots/generate_sslroots.py
@@ -0,0 +1,190 @@
+# -*- coding:utf-8 -*-
+# Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
+#
+# Use of this source code is governed by a BSD-style license
+# that can be found in the LICENSE file in the root of the source
+# tree. An additional intellectual property rights grant can be found
+# in the file PATENTS.  All contributing project authors may
+# be found in the AUTHORS file in the root of the source tree.
+
+
+"""This is a tool to transform a crt file into a C/C++ header.
+
+Usage:
+generate_sslroots.py cert_file.crt [--verbose | -v] [--full_cert | -f]
+
+Arguments:
+  -v  Print output while running.
+  -f  Add public key and certificate name.  Default is to skip and reduce
+      generated file size.
+"""
+
+import commands
+from optparse import OptionParser
+import os
+import re
+import string
+
+_GENERATED_FILE = 'sslroots.h'
+_PREFIX = '__generated__'
+_EXTENSION = '.crt'
+_SUBJECT_NAME_ARRAY = 'subject_name'
+_SUBJECT_NAME_VARIABLE = 'SubjectName'
+_PUBLIC_KEY_ARRAY = 'public_key'
+_PUBLIC_KEY_VARIABLE = 'PublicKey'
+_CERTIFICATE_ARRAY = 'certificate'
+_CERTIFICATE_VARIABLE = 'Certificate'
+_CERTIFICATE_SIZE_VARIABLE = 'CertificateSize'
+_INT_TYPE = 'size_t'
+_CHAR_TYPE = 'const unsigned char*'
+_VERBOSE = 'verbose'
+
+
+def main():
+  """The main entrypoint."""
+  parser = OptionParser('usage %prog FILE')
+  parser.add_option('-v', '--verbose', dest='verbose', action='store_true')
+  parser.add_option('-f', '--full_cert', dest='full_cert', action='store_true')
+  options, args = parser.parse_args()
+  if len(args) < 1:
+    parser.error('No crt file specified.')
+    return
+  root_dir = _SplitCrt(args[0], options)
+  _GenCFiles(root_dir, options)
+  _Cleanup(root_dir)
+
+
+def _SplitCrt(source_file, options):
+  sub_file_blocks = []
+  label_name = ''
+  root_dir = os.path.dirname(os.path.abspath(source_file)) + '/'
+  _PrintOutput(root_dir, options)
+  f = open(source_file)
+  for line in f:
+    if line.startswith('# Label: '):
+      sub_file_blocks.append(line)
+      label = re.search(r'\".*\"', line)
+      temp_label = label.group(0)
+      end = len(temp_label)-1
+      label_name = _SafeName(temp_label[1:end])
+    elif line.startswith('-----END CERTIFICATE-----'):
+      sub_file_blocks.append(line)
+      new_file_name = root_dir + _PREFIX + label_name + _EXTENSION
+      _PrintOutput('Generating: ' + new_file_name, options)
+      new_file = open(new_file_name, 'w')
+      for out_line in sub_file_blocks:
+        new_file.write(out_line)
+      new_file.close()
+      sub_file_blocks = []
+    else:
+      sub_file_blocks.append(line)
+  f.close()
+  return root_dir
+
+
+def _GenCFiles(root_dir, options):
+  output_header_file = open(root_dir + _GENERATED_FILE, 'w')
+  output_header_file.write(_CreateOutputHeader())
+  if options.full_cert:
+    subject_name_list = _CreateArraySectionHeader(_SUBJECT_NAME_VARIABLE,
+                                                  _CHAR_TYPE, options)
+    public_key_list = _CreateArraySectionHeader(_PUBLIC_KEY_VARIABLE,
+                                                _CHAR_TYPE, options)
+  certificate_list = _CreateArraySectionHeader(_CERTIFICATE_VARIABLE,
+                                               _CHAR_TYPE, options)
+  certificate_size_list = _CreateArraySectionHeader(_CERTIFICATE_SIZE_VARIABLE,
+                                                    _INT_TYPE, options)
+
+  for _, _, files in os.walk(root_dir):
+    for current_file in files:
+      if current_file.startswith(_PREFIX):
+        prefix_length = len(_PREFIX)
+        length = len(current_file) - len(_EXTENSION)
+        label = current_file[prefix_length:length]
+        filtered_output, cert_size = _CreateCertSection(root_dir, current_file,
+                                                        label, options)
+        output_header_file.write(filtered_output + '\n\n\n')
+        if options.full_cert:
+          subject_name_list += _AddLabelToArray(label, _SUBJECT_NAME_ARRAY)
+          public_key_list += _AddLabelToArray(label, _PUBLIC_KEY_ARRAY)
+        certificate_list += _AddLabelToArray(label, _CERTIFICATE_ARRAY)
+        certificate_size_list += ('  %s,\n') %(cert_size)
+
+  if options.full_cert:
+    subject_name_list += _CreateArraySectionFooter()
+    output_header_file.write(subject_name_list)
+    public_key_list += _CreateArraySectionFooter()
+    output_header_file.write(public_key_list)
+  certificate_list += _CreateArraySectionFooter()
+  output_header_file.write(certificate_list)
+  certificate_size_list += _CreateArraySectionFooter()
+  output_header_file.write(certificate_size_list)
+  output_header_file.close()
+
+
+def _Cleanup(root_dir):
+  for f in os.listdir(root_dir):
+    if f.startswith(_PREFIX):
+      os.remove(root_dir + f)
+
+
+def _CreateCertSection(root_dir, source_file, label, options):
+  command = 'openssl x509 -in %s%s -noout -C' %(root_dir, source_file)
+  _PrintOutput(command, options)
+  output = commands.getstatusoutput(command)[1]
+  renamed_output = output.replace('unsigned char XXX_',
+                                  'const unsigned char ' + label + '_')
+  filtered_output = ''
+  cert_block = '^const unsigned char.*?};$'
+  prog = re.compile(cert_block, re.IGNORECASE | re.MULTILINE | re.DOTALL)
+  if not options.full_cert:
+    filtered_output = prog.sub('', renamed_output, count=2)
+  else:
+    filtered_output = renamed_output
+
+  cert_size_block = r'\d\d\d+'
+  prog2 = re.compile(cert_size_block, re.MULTILINE | re.VERBOSE)
+  result = prog2.findall(renamed_output)
+  cert_size = result[len(result) - 1]
+
+  return filtered_output, cert_size
+
+
+def _CreateOutputHeader():
+  output = ('// This file is the root certificates in C form that are needed to'
+            ' connect to\n// Google.\n\n'
+            '// It was generated with the following command line:\n'
+            '// > python tools/certs/generate_sslroots.py'
+            '\n//    https://pki.google.com/roots.pem\n\n')
+  return output
+
+
+def _CreateArraySectionHeader(type_name, type_type, options):
+  output = ('const %s kSSLCert%sList[] = {\n') %(type_type, type_name)
+  _PrintOutput(output, options)
+  return output
+
+
+def _AddLabelToArray(label, type_name):
+  return ' %s_%s,\n' %(label, type_name)
+
+
+def _CreateArraySectionFooter():
+  return '};\n\n'
+
+
+def _SafeName(original_file_name):
+  bad_chars = ' -./\\()áéíőú'
+  replacement_chars = ''
+  for _ in bad_chars:
+    replacement_chars += '_'
+  translation_table = string.maketrans(bad_chars, replacement_chars)
+  return original_file_name.translate(translation_table)
+
+
+def _PrintOutput(output, options):
+  if options.verbose:
+    print output
+
+if __name__ == '__main__':
+  main()