Use the HASH_ResultLenContext and HASH_GetType functions, now that they

crypto/signature_verifier_nss.cc

 // Copyright (c) 2011 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_verifier.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <secerr.h>
@@ skipping 17 matching lines @@
   }
   return HASH_AlgNULL;
 }
 
 SECStatus VerifyRSAPSS_End(SECKEYPublicKey* public_key,
                            HASHContext* hash_context,
                            HASH_HashType mask_hash_alg,
                            unsigned int salt_len,
                            const unsigned char* signature,
                            unsigned int signature_len) {
-  unsigned int hash_len = hash_context->hashobj->length;
+  unsigned int hash_len = HASH_ResultLenContext(hash_context);
   std::vector<unsigned char> hash(hash_len);
   HASH_End(hash_context, &hash[0], &hash_len, hash.size());
 
   unsigned int modulus_len = SECKEY_PublicKeyStrength(public_key);
   if (signature_len != modulus_len) {
     PORT_SetError(SEC_ERROR_BAD_SIGNATURE);
     return SECFailure;
   }
   std::vector<unsigned char> enc(signature_len);
   SECStatus rv = PK11_PubEncryptRaw(public_key, &enc[0],
                                     const_cast<unsigned char*>(signature),
                                     signature_len, NULL);
   if (rv != SECSuccess) {
     LOG(WARNING) << "PK11_PubEncryptRaw failed";
     return rv;
   }
   return emsa_pss_verify(&hash[0], &enc[0], enc.size(),
-                         hash_context->hashobj->type, mask_hash_alg,
+                         HASH_GetType(hash_context), mask_hash_alg,
                          salt_len);
 }
 
 }  // namespace
 
 SignatureVerifier::SignatureVerifier()
     : vfy_context_(NULL),
       hash_alg_(SHA1),
       mask_hash_alg_(SHA1),
       salt_len_(0),
@@ skipping 150 matching lines @@
     hash_context_ = NULL;
   }
   if (public_key_) {
     SECKEY_DestroyPublicKey(public_key_);
     public_key_ = NULL;
   }
   signature_.clear();
 }
 
 }  // namespace crypto