Mailing List Archive

svn commit: r1895287 - in /httpd/httpd/trunk/modules/md: md_crypt.c md_version.h
Author: icing
Date: Wed Nov 24 10:56:20 2021
New Revision: 1895287

URL: http://svn.apache.org/viewvc?rev=1895287&view=rev
Log:
* mod_md: resurrection of r1893969 after accidental overwrite in r1894610

Modified:
httpd/httpd/trunk/modules/md/md_crypt.c
httpd/httpd/trunk/modules/md/md_version.h

Modified: httpd/httpd/trunk/modules/md/md_crypt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_crypt.c?rev=1895287&r1=1895286&r2=1895287&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_crypt.c (original)
+++ httpd/httpd/trunk/modules/md/md_crypt.c Wed Nov 24 10:56:20 2021
@@ -644,6 +644,7 @@ static apr_status_t pkey_to_buffer(md_da
const EVP_CIPHER *cipher = NULL;
pem_password_cb *cb = NULL;
void *cb_baton = NULL;
+ apr_status_t rv = APR_SUCCESS;
passwd_ctx ctx;
unsigned long err;
int i;
@@ -652,7 +653,8 @@ static apr_status_t pkey_to_buffer(md_da
return APR_ENOMEM;
}
if (pass_len > INT_MAX) {
- return APR_EINVAL;
+ rv = APR_EINVAL;
+ goto cleanup;
}
if (pass && pass_len > 0) {
ctx.pass_phrase = pass;
@@ -661,7 +663,8 @@ static apr_status_t pkey_to_buffer(md_da
cb_baton = &ctx;
cipher = EVP_aes_256_cbc();
if (!cipher) {
- return APR_ENOTIMPL;
+ rv = APR_ENOTIMPL;
+ goto cleanup;
}
}

@@ -671,11 +674,11 @@ static apr_status_t pkey_to_buffer(md_da
#else
if (!PEM_write_bio_PrivateKey(bio, pkey->pkey, cipher, NULL, 0, cb, cb_baton)) {
#endif
- BIO_free(bio);
err = ERR_get_error();
md_log_perror(MD_LOG_MARK, MD_LOG_ERR, 0, p, "PEM_write key: %ld %s",
err, ERR_error_string(err, NULL));
- return APR_EINVAL;
+ rv = APR_EINVAL;
+ goto cleanup;
}

md_data_null(buf);
@@ -685,8 +688,10 @@ static apr_status_t pkey_to_buffer(md_da
i = BIO_read(bio, (char*)buf->data, i);
buf->len = (apr_size_t)i;
}
+
+cleanup:
BIO_free(bio);
- return APR_SUCCESS;
+ return rv;
}

apr_status_t md_pkey_fsave(md_pkey_t *pkey, apr_pool_t *p,

Modified: httpd/httpd/trunk/modules/md/md_version.h
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/md/md_version.h?rev=1895287&r1=1895286&r2=1895287&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/md/md_version.h (original)
+++ httpd/httpd/trunk/modules/md/md_version.h Wed Nov 24 10:56:20 2021
@@ -27,7 +27,7 @@
* @macro
* Version number of the md module as c string
*/
-#define MOD_MD_VERSION "2.4.9"
+#define MOD_MD_VERSION "2.4.10"

/**
* @macro
@@ -35,7 +35,7 @@
* release. This is a 24 bit number with 8 bits for major number, 8 bits
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
*/
-#define MOD_MD_VERSION_NUM 0x020409
+#define MOD_MD_VERSION_NUM 0x02040a

#define MD_ACME_DEF_URL "https://acme-v02.api.letsencrypt.org/directory"