Reland r209278

crypto/signature_creator_nss.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/signature_creator.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <stdlib.h>
 
@@ skipping 26 matching lines @@
   SECStatus rv = SGN_Begin(result->sign_context_);
   if (rv != SECSuccess) {
     NOTREACHED();
     return NULL;
   }
 
   return result.release();
 }
 
 bool SignatureCreator::Update(const uint8* data_part, int data_part_len) {
-  // TODO(wtc): Remove this const_cast when we require NSS 3.12.5.
-  // See NSS bug https://bugzilla.mozilla.org/show_bug.cgi?id=518255
-  SECStatus rv = SGN_Update(sign_context_,
-                            const_cast<unsigned char*>(data_part),
-                            data_part_len);
+  SECStatus rv = SGN_Update(sign_context_, data_part, data_part_len);
   if (rv != SECSuccess) {
     NOTREACHED();
     return false;
   }
 
   return true;
 }
 
 bool SignatureCreator::Final(std::vector<uint8>* signature) {
   SECItem signature_item;
   SECStatus rv = SGN_End(sign_context_, &signature_item);
   if (rv != SECSuccess) {
     NOTREACHED();
     return false;
   }
   signature->assign(signature_item.data,
                     signature_item.data + signature_item.len);
   SECITEM_FreeItem(&signature_item, PR_FALSE);
   return true;
 }
 
 SignatureCreator::SignatureCreator()
     : key_(NULL),
       sign_context_(NULL) {
   EnsureNSSInit();
 }
 
 }  // namespace crypto