diff options
| author | Ingela Anderton Andin <[email protected]> | 2011-12-07 11:30:04 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2011-12-07 11:30:04 +0100 |
| commit | b82fcb999812a66a56da82ba694abeb4d32dbbab (patch) | |
| tree | 2180b1092844bcd9d03e7590e5815c1eaec2dd95 /lib/ssl/test/erl_make_certs.erl | |
| parent | 026a7c04fdf7add071ee61b1ac24a5ebbcbb73db (diff) | |
| download | otp-b82fcb999812a66a56da82ba694abeb4d32dbbab.tar.gz otp-b82fcb999812a66a56da82ba694abeb4d32dbbab.tar.bz2 otp-b82fcb999812a66a56da82ba694abeb4d32dbbab.zip | |
Add default value for "user" if os:getenv("USER") returns false
Diffstat (limited to 'lib/ssl/test/erl_make_certs.erl')
| -rw-r--r-- | lib/ssl/test/erl_make_certs.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/ssl/test/erl_make_certs.erl b/lib/ssl/test/erl_make_certs.erl index 8b01ca3ad4..254aa6d2f9 100644 --- a/lib/ssl/test/erl_make_certs.erl +++ b/lib/ssl/test/erl_make_certs.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010. All Rights Reserved. +%% Copyright Ericsson AB 2011. 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 @@ -175,7 +175,7 @@ issuer(true, Opts, SubjectKey) -> issuer({Issuer, IssuerKey}, _Opts, _SubjectKey) when is_binary(Issuer) -> {issuer_der(Issuer), decode_key(IssuerKey)}; issuer({File, IssuerKey}, _Opts, _SubjectKey) when is_list(File) -> - {ok, [{cert, Cert, _}|_]} = public_key:pem_to_der(File), + {ok, [{cert, Cert, _}|_]} = pem_to_der(File), {issuer_der(Cert), decode_key(IssuerKey)}. issuer_der(Issuer) -> @@ -185,7 +185,7 @@ issuer_der(Issuer) -> Subject. subject(undefined, IsRootCA) -> - User = if IsRootCA -> "RootCA"; true -> os:getenv("USER") end, + User = if IsRootCA -> "RootCA"; true -> user() end, Opts = [{email, User ++ "@erlang.org"}, {name, User}, {city, "Stockholm"}, @@ -196,6 +196,14 @@ subject(undefined, IsRootCA) -> subject(Opts, _) -> subject(Opts). +user() -> + case os:getenv("USER") of + false -> + "test_user"; + User -> + User + end. + subject(SubjectOpts) when is_list(SubjectOpts) -> Encode = fun(Opt) -> {Type,Value} = subject_enc(Opt), |