OpenSSL: use nondeprecated EC-group functions under 3.0.0.

[exim.git] / src / src / arc.c

diff --git a/src/src/arc.c b/src/src/arc.c
index 0617312801f342f4500f21c6096942d27bbf54f9..9678ceb2d98d6088521f1b46a9eea3353021e230 100644 (file)
--- a/src/src/arc.c
+++ b/src/src/arc.c
@@ -3,6 +3,7 @@
 *************************************************/
 /* Experimental ARC support for Exim
    Copyright (c) Jeremy Harris 2018 - 2020
+   Copyright (c) The Exim Maintainers 2021
    License: GPL
 */
 
@@ -1607,14 +1608,12 @@ expire = now = 0;
 
 /* Parse the signing specification */
 
-identity = string_nextinlist(&signspec, &sep, NULL, 0);
-selector = string_nextinlist(&signspec, &sep, NULL, 0);
-if (  !*identity || !*selector
-   || !(privkey = string_nextinlist(&signspec, &sep, NULL, 0)) || !*privkey)
-  {
-  s = !*identity ? US"identity" : !*selector ? US"selector" : US"private-key";
-  goto bad_arg_ret;
-  }
+if (!(identity = string_nextinlist(&signspec, &sep, NULL, 0)) || !*identity)
+  { s = US"identity"; goto bad_arg_ret; }
+if (!(selector = string_nextinlist(&signspec, &sep, NULL, 0)) || !*selector)
+  { s = US"selector"; goto bad_arg_ret; }
+if (!(privkey = string_nextinlist(&signspec, &sep, NULL, 0))  || !*privkey)
+  { s = US"privkey"; goto bad_arg_ret; }
 if (!arc_valid_id(identity))
   { s = US"identity"; goto bad_arg_ret; }
 if (!arc_valid_id(selector))