logo

overlay

My own overlay for experimentations, use with caution, no support is provided git clone https://anongit.hacktivis.me/git/overlay.git/

gzsig-20060130-x509.c-Update-for-OpenSSL-3.x.patch (1865B)

    

  1. From 7ac9a2f8c3b275919ab2df012a5b223880e13f39 Mon Sep 17 00:00:00 2001
  2. From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
  3. Date: Sat, 13 Sep 2025 07:29:36 +0200
  4. Subject: [PATCH 3/4] x509.c: Update for OpenSSL 3.x
  6. ---
  7.  x509.c | 38 ++++++++++++++++++++++++--------------
  8.  1 file changed, 24 insertions(+), 14 deletions(-)
  10. diff --git a/x509.c b/x509.c
  11. index 99dcc52..53f51fc 100644
  12. --- a/x509.c
  13. +++ b/x509.c
  14. @@ -75,18 +75,24 @@ x509_load_public(struct key *k, struct iovec *iov)
  15.  		return (-1);
  16.  
  17.  	evp = X509_get_pubkey(cert);
  18. -	
  19. -	if (evp->type == EVP_PKEY_RSA) {
  20. +
  21. +	int evp_id = EVP_PKEY_base_id(evp);
  22. +	switch(evp_id)
  23. +	{
  24. +	case EVP_PKEY_RSA:
  25.  		k->type = KEY_RSA;
  26. -		k->data = (void *)RSAPublicKey_dup(evp->pkey.rsa);
  27. -	} else if (evp->type == EVP_PKEY_DSA) {
  28. +		k->data = EVP_PKEY_get1_RSA(evp);
  29. +		break;
  30. +	case EVP_PKEY_DSA:
  31.  		k->type = KEY_DSA;
  32. -		k->data = (void *)evp->pkey.dsa;
  33. -		evp->pkey.dsa = NULL;			/* XXX */
  34. -	} else {
  35. +		k->data = EVP_PKEY_get1_DSA(evp);
  36. +		break;
  37. +	default:
  38. +		fprintf(stderr, "gzsig: error: Unknown key type %d\n", evp_id);
  39.  		X509_free(cert);
  40.  		return (-1);
  41.  	}
  42. +
  43.  	X509_free(cert);
  44.  	
  45.  	return (0);
  46. @@ -119,15 +125,19 @@ x509_load_private(struct key *k, struct iovec *iov)
  47.  	if (evp == NULL)
  48.  		return (-1);
  49.  
  50. -	if (evp->type == EVP_PKEY_RSA) {
  51. +	int evp_id = EVP_PKEY_base_id(evp);
  52. +	switch(evp_id)
  53. +	{
  54. +	case EVP_PKEY_RSA:
  55.  		k->type = KEY_RSA;
  56. -		k->data = (void *)evp->pkey.rsa;
  57. -		evp->pkey.rsa = NULL;			/* XXX */
  58. -	} else if (evp->type == EVP_PKEY_DSA) {
  59. +		k->data = EVP_PKEY_get1_RSA(evp);
  60. +		break;
  61. +	case EVP_PKEY_DSA:
  62.  		k->type = KEY_DSA;
  63. -		k->data = (void *)evp->pkey.dsa;
  64. -		evp->pkey.dsa = NULL;			/* XXX */
  65. -	} else {
  66. +		k->data = EVP_PKEY_get1_DSA(evp);
  67. +		break;
  68. +	default:
  69. +		fprintf(stderr, "gzsig: error: Unknown key type %d\n", evp_id);
  70.  		EVP_PKEY_free(evp);
  71.  		return (-1);
  72.  	}
  73. -- 
  74. 2.49.1