Use the new library context aware SRP functions in sslapitest
authorMatt Caswell <matt@openssl.org>
Fri, 20 Mar 2020 17:24:51 +0000 (17:24 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 27 Mar 2020 11:29:26 +0000 (11:29 +0000)
For the moment this still just uses the default library context, but a
future version of sslapitest will specify a non-default library context.

Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/11410)

test/sslapitest.c

index a9b7d20..7956353 100644 (file)
@@ -5533,8 +5533,8 @@ static int create_new_vfile(char *userid, char *password, const char *filename)
     if (!TEST_ptr(dummy) || !TEST_ptr(row))
         goto end;
 
-    gNid = SRP_create_verifier(userid, password, &row[DB_srpsalt],
-                               &row[DB_srpverifier], NULL, NULL);
+    gNid = SRP_create_verifier_ex(userid, password, &row[DB_srpsalt],
+                                  &row[DB_srpverifier], NULL, NULL, NULL, NULL);
     if (!TEST_ptr(gNid))
         goto end;
 
@@ -5590,8 +5590,8 @@ static int create_new_vbase(char *userid, char *password)
     if (!TEST_ptr(lgN))
         goto end;
 
-    if (!TEST_true(SRP_create_verifier_BN(userid, password, &salt, &verifier,
-                                          lgN->N, lgN->g)))
+    if (!TEST_true(SRP_create_verifier_BN_ex(userid, password, &salt, &verifier,
+                                             lgN->N, lgN->g, NULL, NULL)))
         goto end;
 
     user_pwd = OPENSSL_zalloc(sizeof(*user_pwd));