diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-24 12:15:56 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-05-24 12:15:56 -0500 |
| commit | dcd29b49bac8d5e896870121d7b1d3703d50d395 (patch) | |
| tree | f2dd31f24e0df9d27e3a4c4f6f870b63b13aa003 | |
| parent | 2918db0b72f841ace8561bc0f85d8d4c190bc169 (diff) | |
| parent | 846e310524f34888bc42cb6afc234a20f01e3b58 (diff) | |
| download | cryptography-dcd29b49bac8d5e896870121d7b1d3703d50d395.tar.gz cryptography-dcd29b49bac8d5e896870121d7b1d3703d50d395.tar.bz2 cryptography-dcd29b49bac8d5e896870121d7b1d3703d50d395.zip | |
Merge pull request #1988 from eeshangarg/issue-1987-replace-license-header
Add the dual license header to hazmat/backends/openssl/x509.py
| -rw-r--r-- | src/cryptography/hazmat/backends/openssl/x509.py | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/src/cryptography/hazmat/backends/openssl/x509.py b/src/cryptography/hazmat/backends/openssl/x509.py index c7d2d154..f46dd1b7 100644 --- a/src/cryptography/hazmat/backends/openssl/x509.py +++ b/src/cryptography/hazmat/backends/openssl/x509.py @@ -1,15 +1,6 @@ -# 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. +# This file is dual licensed under the terms of the Apache License, Version +# 2.0, and the BSD License. See the LICENSE file in the root of this repository +# for complete details. from __future__ import absolute_import, division, print_function |