X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ssl%2Fssltest.c;h=0f8fd3902da52b8e3243d1f6ef927322eb54b22c;hb=48e0f6667b86cade6e7b7afa83c7006ab7e8c2d1;hp=582b9ca1655df6a9f8fab53797e9eff245146f0e;hpb=7043fa702fa102a45b102e11990b650360c35503;p=oweals%2Fopenssl.git

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 582b9ca165..0f8fd3902d 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -266,12 +266,6 @@ static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg)
 	return BUF_strdup((char *)srp_client_arg->srppassin);
 	}
 
-static char * MS_CALLBACK missing_srp_username_callback(SSL *s, void *arg)
-	{
-	SRP_CLIENT_ARG *srp_client_arg = (SRP_CLIENT_ARG *)arg;
-	return BUF_strdup(srp_client_arg->srplogin);
-	}
-
 /* SRP server */
 /* This is a context that we pass to SRP server callbacks */
 typedef struct srp_server_arg_st
@@ -537,7 +531,6 @@ int main(int argc, char *argv[])
 #endif
 #ifndef OPENSSL_NO_SRP
 	/* client */
-	int srp_lateuser = 0;
 	SRP_CLIENT_ARG srp_client_arg = {NULL,NULL};
 	/* server */
 	SRP_SERVER_ARG srp_server_arg = {NULL,NULL};
@@ -943,7 +936,11 @@ bad:
 				}
 			}
 		else
+#ifdef OPENSSL_NO_EC2M
+			nid = NID_X9_62_prime256v1;
+#else
 			nid = NID_sect163r2;
+#endif
 
 		ecdh = EC_KEY_new_by_curve_name(nid);
 		if (ecdh == NULL)
@@ -1049,9 +1046,7 @@ bad:
 #ifndef OPENSSL_NO_SRP
         if (srp_client_arg.srplogin)
 		{
-		if (srp_lateuser) 
-			SSL_CTX_set_srp_missing_srp_username_callback(c_ctx,missing_srp_username_callback);
-		else if (!SSL_CTX_set_srp_username(c_ctx, srp_client_arg.srplogin))
+		if (!SSL_CTX_set_srp_username(c_ctx, srp_client_arg.srplogin))
 			{
 			BIO_printf(bio_err,"Unable to set SRP username\n");
 			goto end;