diff options
Diffstat (limited to 'security/pkix/lib/pkixder.cpp')
| -rw-r--r-- | security/pkix/lib/pkixder.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/security/pkix/lib/pkixder.cpp b/security/pkix/lib/pkixder.cpp index 7aa4f77f95..f1fc849732 100644 --- a/security/pkix/lib/pkixder.cpp +++ b/security/pkix/lib/pkixder.cpp @@ -1,29 +1,11 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This code is made available to you under your choice of the following sets - * of licensing terms: - */ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -/* Copyright 2013 Mozilla Contributors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "pkixder.h" -#include "pkixutil.h" +#include "pkix/pkixder.h" +#include "pkix/pkixutil.h" namespace mozilla { namespace pkix { namespace der { @@ -212,7 +194,6 @@ SignatureAlgorithmIdentifierValue(Reader& input, Result DigestAlgorithmIdentifier(Reader& input, /*out*/ DigestAlgorithm& algorithm) { - Reader r; return der::Nested(input, SEQUENCE, [&algorithm](Reader& r) -> Result { Reader algorithmID; Result rv = AlgorithmIdentifierValue(r, algorithmID); |