===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/openssl/dsaparam.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/openssl/dsaparam.c	2021/11/20 18:10:48	1.12
--- src/usr.bin/openssl/dsaparam.c	2022/01/14 09:24:20	1.13
***************
*** 1,4 ****
! /* $OpenBSD: dsaparam.c,v 1.12 2021/11/20 18:10:48 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
--- 1,4 ----
! /* $OpenBSD: dsaparam.c,v 1.13 2022/01/14 09:24:20 tb Exp $ */
  /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
   * All rights reserved.
   *
***************
*** 259,272 ****
  		unsigned char *data;
  		int l, len, bits_p;
  
! 		len = BN_num_bytes(dsa->p);
! 		bits_p = BN_num_bits(dsa->p);
  		data = malloc(len + 20);
  		if (data == NULL) {
  			perror("malloc");
  			goto end;
  		}
! 		l = BN_bn2bin(dsa->p, data);
  		printf("static unsigned char dsa%d_p[] = {", bits_p);
  		for (i = 0; i < l; i++) {
  			if ((i % 12) == 0)
--- 259,272 ----
  		unsigned char *data;
  		int l, len, bits_p;
  
! 		len = BN_num_bytes(DSA_get0_p(dsa));
! 		bits_p = BN_num_bits(DSA_get0_p(dsa));
  		data = malloc(len + 20);
  		if (data == NULL) {
  			perror("malloc");
  			goto end;
  		}
! 		l = BN_bn2bin(DSA_get0_p(dsa), data);
  		printf("static unsigned char dsa%d_p[] = {", bits_p);
  		for (i = 0; i < l; i++) {
  			if ((i % 12) == 0)
***************
*** 275,281 ****
  		}
  		printf("\n\t};\n");
  
! 		l = BN_bn2bin(dsa->q, data);
  		printf("static unsigned char dsa%d_q[] = {", bits_p);
  		for (i = 0; i < l; i++) {
  			if ((i % 12) == 0)
--- 275,281 ----
  		}
  		printf("\n\t};\n");
  
! 		l = BN_bn2bin(DSA_get0_q(dsa), data);
  		printf("static unsigned char dsa%d_q[] = {", bits_p);
  		for (i = 0; i < l; i++) {
  			if ((i % 12) == 0)
***************
*** 284,290 ****
  		}
  		printf("\n\t};\n");
  
! 		l = BN_bn2bin(dsa->g, data);
  		printf("static unsigned char dsa%d_g[] = {", bits_p);
  		for (i = 0; i < l; i++) {
  			if ((i % 12) == 0)
--- 284,290 ----
  		}
  		printf("\n\t};\n");
  
! 		l = BN_bn2bin(DSA_get0_g(dsa), data);
  		printf("static unsigned char dsa%d_g[] = {", bits_p);
  		for (i = 0; i < l; i++) {
  			if ((i % 12) == 0)
***************
*** 295,310 ****
  		printf("\n\t};\n\n");
  
  		printf("DSA *get_dsa%d()\n\t{\n", bits_p);
  		printf("\tDSA *dsa;\n\n");
  		printf("\tif ((dsa = DSA_new()) == NULL) return(NULL);\n");
! 		printf("\tdsa->p = BN_bin2bn(dsa%d_p, sizeof(dsa%d_p), NULL);\n",
  		    bits_p, bits_p);
! 		printf("\tdsa->q = BN_bin2bn(dsa%d_q, sizeof(dsa%d_q), NULL);\n",
  		    bits_p, bits_p);
! 		printf("\tdsa->g = BN_bin2bn(dsa%d_g, sizeof(dsa%d_g), NULL);\n",
  		    bits_p, bits_p);
! 		printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
! 		printf("\t\t{ DSA_free(dsa); return(NULL); }\n");
  		printf("\treturn(dsa);\n\t}\n");
  	}
  	if (!dsaparam_config.noout) {
--- 295,312 ----
  		printf("\n\t};\n\n");
  
  		printf("DSA *get_dsa%d()\n\t{\n", bits_p);
+ 		printf("\tBIGNUM *p = NULL, *q = NULL, *g = NULL;\n");
  		printf("\tDSA *dsa;\n\n");
  		printf("\tif ((dsa = DSA_new()) == NULL) return(NULL);\n");
! 		printf("\tp = BN_bin2bn(dsa%d_p, sizeof(dsa%d_p), NULL);\n",
  		    bits_p, bits_p);
! 		printf("\tq = BN_bin2bn(dsa%d_q, sizeof(dsa%d_q), NULL);\n",
  		    bits_p, bits_p);
! 		printf("\tg = BN_bin2bn(dsa%d_g, sizeof(dsa%d_g), NULL);\n",
  		    bits_p, bits_p);
! 		printf("\tif (p == NULL || q == NULL || g == NULL)\n");
! 		printf("\t\t{ BN_free(p); BN_free(q); BN_free(g); DSA_free(dsa); return(NULL); }\n");
! 		printf("\tDSA_set0_pqg(dsa, p, q, g);\n");
  		printf("\treturn(dsa);\n\t}\n");
  	}
  	if (!dsaparam_config.noout) {