Browse Source

fix 18.0 erlang binary

Namdak Tonpa 5 years ago
parent
commit
5372fea3f9
4 changed files with 6 additions and 7 deletions
  1. 1 1
      include/mad.hrl
  2. BIN
      mad
  3. 4 5
      src/mad_ca.erl
  4. 1 1
      src/mad_man.erl

+ 1 - 1
include/mad.hrl

@@ -1 +1 @@
--define(VERSION,"6.8.0-33-gc24b185").
+-define(VERSION,"6.8.0-34-ge6e7c86").

BIN
mad


+ 4 - 5
src/mad_ca.erl

@@ -36,7 +36,6 @@ enroll(Crypto,Type,Name) when (Type == "server" orelse Type == "client" orelse T
                       andalso (Crypto == "rsa" orelse Crypto == "ecc") ->
     Pass = application:get_env(ca,passin,"pass:0"),
     application:start(inets),
-    X   = string:join(Name,"\\ "),
     Y   = string:join(Name," "),
     ok  = key(Crypto,Pass,Y),
     {ok, F} = file:read_file(cat(["cert/",Crypto,"/",Y,".csr"])),
@@ -53,19 +52,19 @@ dump(PEM,Y) ->
     io:format("CERT: ~s KEY: ~p~n",[Y,PKIInfo]).
 
 key("rsa",_,X) ->
-    {done,0,Bin}  = sh:run("openssl genrsa -out \"cert/rsa/"++ X ++ ".key\" 2048"),
-    {done,0,Bin2} = sh:run("openssl req -new -days 365 -key \"cert/rsa/"++ X ++".key\" -out \"cert/rsa/"++ X ++".csr\" "
+    {done,0,_}  = sh:run("openssl genrsa -out \"cert/rsa/"++ X ++ ".key\" 2048"),
+    {done,0,_} = sh:run("openssl req -new -days 365 -key \"cert/rsa/"++ X ++".key\" -out \"cert/rsa/"++ X ++".csr\" "
         " -subj \"/C=UA/ST=Kyiv/O=SYNRC/CN="++ X ++ "\""), ok;
 
 key("ecc",Pass,X) ->
     Pass = application:get_env(ca,passin,"pass:0"),
     {done,0,_}   = sh:run("openssl ecparam -name secp384r1 -out \"cert/ecc/"++X++".ecp\""),
     {done,0,_}   = sh:run("cp \"cert/ecc/"++X++".ecp\" key"),
-    {done,0,Bin} = sh:run("openssl req -config cert/ecc/synrc.cnf -passout " ++ Pass ++
+    {done,0,_} = sh:run("openssl req -config cert/ecc/synrc.cnf -passout " ++ Pass ++
         " -new -newkey ec:key -keyout \"cert/ecc/"++X++".key.enc\" -out \"cert/ecc/"++X++".csr\""
         " -subj \"/C=UA/ST=Kyiv/O=SYNRC/CN="++X++"\""),
     {done,0,_}    = sh:run("rm key"),
-    {done,0,Bin2} = sh:run("openssl ec -in \"cert/ecc/"++X++".key.enc\" -out \"cert/ecc/"++X++".key\" -passin "++Pass),
+    {done,0,_} = sh:run("openssl ec -in \"cert/ecc/"++X++".key.enc\" -out \"cert/ecc/"++X++".key\" -passin "++Pass),
     ok.
 
 cnf() ->

+ 1 - 1
src/mad_man.erl

@@ -52,7 +52,7 @@ trim(A) when is_binary(A) -> re:replace(A, "(^\\s+)|(\\s+$)", "", [global,{retur
 fix([Prefix]) -> Prefix;
 fix([_Prefix,Name|_Rest]) -> Name.
 check(Filename) ->
-   try _ = xmerl_scan:file(Filename), {ok,Filename} catch E:R ->
+   try _ = xmerl_scan:file(Filename), {ok,Filename} catch _:R ->
    io:format("man: ~p error: ~p~n",[Filename, case R of function_clause -> erlang:get_stacktrace(); _ -> R end]), {error,Filename} end.
 
 generate(Lower,Temp) ->