commit 4bcdd2ba40de41d306d0ece671f076660582a145
author Mike Frysinger <vapier@chromium.org> Thu Apr 17 22:12:32 2014 -0400
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Apr 18 21:32:30 2014 +0000
tree 9afefbd1c81995c95bbcf87b5ad61d58f84da979
parent 4c50c54c3cd1b4c9360b27b31aa276b215dcaab9

switch to common nss util names

We're installing symlinks for all the nss utils with a "nss" prefix that
are only used by these tests.  Use the plain names that upstream is using
so we can drop them.

BUG=None
TEST=`cbuildbot {arm,amd64,x86}-generic-full` passes

Change-Id: I46dfd7dbc1379a0ef491bce573ac5e63b86846ef
Reviewed-on: https://chromium-review.googlesource.com/195474
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>

client/cros/ownership.py

diff --git a/client/cros/ownership.py b/client/cros/ownership.py
index ed3a115..d5a5258 100644
--- a/client/cros/ownership.py
+++ b/client/cros/ownership.py
@@ -10,8 +10,8 @@
 from autotest_lib.client.cros import cros_ui
 
 
-PK12UTIL = 'nsspk12util'
-CERTUTIL = 'nsscertutil'
+PK12UTIL = 'pk12util'
+CERTUTIL = 'certutil'
 OPENSSLP12 = 'openssl pkcs12'
 OPENSSLX509 = 'openssl x509'
 OPENSSLRSA = 'openssl rsa'

client/cros/recall.py

diff --git a/client/cros/recall.py b/client/cros/recall.py
index 79b28f5..859510d 100644
--- a/client/cros/recall.py
+++ b/client/cros/recall.py
@@ -84,7 +84,7 @@
         logging.debug("Creating NSS database in %s", constants.FAKE_NSSDB_DIR)
         os.mkdir(constants.FAKE_NSSDB_DIR, 0755)
 
-        cmd = ( 'nsscertutil', '-d', 'sql:' + constants.FAKE_NSSDB_DIR,
+        cmd = ( 'certutil', '-d', 'sql:' + constants.FAKE_NSSDB_DIR,
                 '-N', '-f', '/dev/fd/0' )
         proc = subprocess.Popen(cmd, stdin=subprocess.PIPE)
         proc.communicate('\n')
@@ -92,7 +92,7 @@
             raise error.TestError("Failed to create nssdb")
 
         logging.debug("Adding certificate to database")
-        cmd = ( 'nsscertutil', '-d', 'sql:' + constants.FAKE_NSSDB_DIR,
+        cmd = ( 'certutil', '-d', 'sql:' + constants.FAKE_NSSDB_DIR,
                 '-A', '-n', "Chromium OS Test Server", '-t', 'C,,', '-a' )
         proc = subprocess.Popen(cmd, stdin=subprocess.PIPE)
         proc.communicate(certificate)