diff options
| author | Erlang/OTP <[email protected]> | 2010-01-19 09:16:47 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-01-19 09:16:47 +0000 |
| commit | ce6ca6867f86c8ba876765d25c52cb80a1c10ad4 (patch) | |
| tree | 8ac2bd7e5417314ffd1dbfb8878a9f73731e5e37 /lib/public_key/src/pubkey_cert_records.erl | |
| parent | e6de285d99aefc1a9de11e6eca187a12fdaf7378 (diff) | |
| parent | fe93630eaef3c403edda47e0531dbd5c11c2aa4a (diff) | |
| download | otp-ce6ca6867f86c8ba876765d25c52cb80a1c10ad4.tar.gz otp-ce6ca6867f86c8ba876765d25c52cb80a1c10ad4.tar.bz2 otp-ce6ca6867f86c8ba876765d25c52cb80a1c10ad4.zip | |
Merge branch 'dgud/ssl-patches-from-Wil' into ccase/r13b04_dev
* dgud/ssl-patches-from-Wil:
Added a public_key:pkix_transform/2 instead and used it from ssl.
Minor code cleanup
new_ssl fix session reuse
Code cleanup
Send CA list during Certificate Request in new_ssl
OTP-8372 Fixed session reuse (in new_ssl), thanks Wil Tan.
Send CA list during Certificate Request (in new_ssl) , thanks Wil
Tan.
Diffstat (limited to 'lib/public_key/src/pubkey_cert_records.erl')
| -rw-r--r-- | lib/public_key/src/pubkey_cert_records.erl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/public_key/src/pubkey_cert_records.erl b/lib/public_key/src/pubkey_cert_records.erl index 36b7c47a9c..c7d4080adb 100644 --- a/lib/public_key/src/pubkey_cert_records.erl +++ b/lib/public_key/src/pubkey_cert_records.erl @@ -1,19 +1,19 @@ %% %% %CopyrightBegin% -%% -%% Copyright Ericsson AB 2008-2009. All Rights Reserved. -%% +%% +%% Copyright Ericsson AB 2008-2010. All Rights Reserved. +%% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the %% Erlang Public License along with this software. If not, it can be %% retrieved online at http://www.erlang.org/. -%% +%% %% Software distributed under the License is distributed on an "AS IS" %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See %% the License for the specific language governing rights and limitations %% under the License. -%% +%% %% %CopyrightEnd% %% @@ -23,7 +23,7 @@ -include("public_key.hrl"). --export([decode_cert/2, encode_cert/1, encode_tbs_cert/1]). +-export([decode_cert/2, encode_cert/1, encode_tbs_cert/1, transform/2]). -export([old_decode_cert/2, old_encode_cert/1]). %% Debugging and testing new code. |