[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user asfgit closed the pull request at: https://github.com/apache/nifi-minifi-cpp/pull/131 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user phrocker commented on a diff in the pull request: https://github.com/apache/nifi-minifi-cpp/pull/131#discussion_r136576120 --- Diff: thirdparty/civetweb-1.9.1/src/civetweb.c --- @@ -11856,7 +11859,24 @@ ssl_get_client_cert_info(struct mg_connection *conn) /* Calculate SHA1 fingerprint and store as a hex string */ ulen = 0; - ASN1_digest((int (*)())i2d_X509, digest, (char *)cert, buf, ); + + /* ASN1_digest is deprecated. Do the calculation manually, --- End diff -- Sorry I missed this response. I was concerned about using custom code in the third party dir, but with that knowledge, with that knowledge it's a non issue. I'll +1 and merge, thanks! --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user achristianson commented on a diff in the pull request: https://github.com/apache/nifi-minifi-cpp/pull/131#discussion_r134803404 --- Diff: thirdparty/civetweb-1.9.1/src/civetweb.c --- @@ -11856,7 +11859,24 @@ ssl_get_client_cert_info(struct mg_connection *conn) /* Calculate SHA1 fingerprint and store as a hex string */ ulen = 0; - ASN1_digest((int (*)())i2d_X509, digest, (char *)cert, buf, ); + + /* ASN1_digest is deprecated. Do the calculation manually, --- End diff -- https://github.com/civetweb/civetweb/commit/fb9ef36bb295cf489aecd79c8bb9c6eac11e896e is where it comes from. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user achristianson commented on a diff in the pull request: https://github.com/apache/nifi-minifi-cpp/pull/131#discussion_r134803190 --- Diff: thirdparty/civetweb-1.9.1/src/civetweb.c --- @@ -11856,7 +11859,24 @@ ssl_get_client_cert_info(struct mg_connection *conn) /* Calculate SHA1 fingerprint and store as a hex string */ ulen = 0; - ASN1_digest((int (*)())i2d_X509, digest, (char *)cert, buf, ); + + /* ASN1_digest is deprecated. Do the calculation manually, --- End diff -- Yes. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user phrocker commented on a diff in the pull request: https://github.com/apache/nifi-minifi-cpp/pull/131#discussion_r134802972 --- Diff: thirdparty/civetweb-1.9.1/src/civetweb.c --- @@ -11856,7 +11859,24 @@ ssl_get_client_cert_info(struct mg_connection *conn) /* Calculate SHA1 fingerprint and store as a hex string */ ulen = 0; - ASN1_digest((int (*)())i2d_X509, digest, (char *)cert, buf, ); + + /* ASN1_digest is deprecated. Do the calculation manually, --- End diff -- is this also a backport? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user achristianson commented on a diff in the pull request: https://github.com/apache/nifi-minifi-cpp/pull/131#discussion_r134278520 --- Diff: docker/Dockerfile --- @@ -100,6 +100,10 @@ RUN mkdir -p $MINIFI_BASE_DIR COPY --from=builder ${MINIFI_HOME} ${MINIFI_HOME} RUN chown -R ${USER}:${USER} /opt/minifi +# Link crypto libs to known locations for civet +RUN ln -s /usr/lib/libcrypto.so.1.0.0 /usr/lib/libcrypto.so --- End diff -- Looking into it... that would be a better fix if it works out. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
Github user phrocker commented on a diff in the pull request: https://github.com/apache/nifi-minifi-cpp/pull/131#discussion_r134278103 --- Diff: docker/Dockerfile --- @@ -100,6 +100,10 @@ RUN mkdir -p $MINIFI_BASE_DIR COPY --from=builder ${MINIFI_HOME} ${MINIFI_HOME} RUN chown -R ${USER}:${USER} /opt/minifi +# Link crypto libs to known locations for civet +RUN ln -s /usr/lib/libcrypto.so.1.0.0 /usr/lib/libcrypto.so --- End diff -- why not set the make option with CIVET? It seems like a bandaid that could come apart if something within the container changed. Could it be such that our make CRYPTO_LIB was determined via an embedded command? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---
[GitHub] nifi-minifi-cpp pull request #131: MINIFI-388 symlink versioned libcrypto/li...
GitHub user achristianson opened a pull request: https://github.com/apache/nifi-minifi-cpp/pull/131 MINIFI-388 symlink versioned libcrypto/libssl to non-versioned path s⦠â¦o that civet can find them when TLS is used ### For all changes: - [x] Is there a JIRA ticket associated with this PR? Is it referenced in the commit message? - [x] Does your PR title start with MINIFI- where is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character. - [x] Has your PR been rebased against the latest commit within the target branch (typically master)? - [x] Is your initial contribution a single, squashed commit? ### For code changes: - [x] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)? - [x] If applicable, have you updated the LICENSE file? - [x] If applicable, have you updated the NOTICE file? ### For documentation related changes: - [x] Have you ensured that format looks appropriate for the output in which it is rendered? ### Note: Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible. You can merge this pull request into a Git repository by running: $ git pull https://github.com/achristianson/nifi-minifi-cpp MINIFI-388 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/nifi-minifi-cpp/pull/131.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #131 commit 6683974e1352e03a0c6861ef058ffa9bf71e9967 Author: Andrew I. ChristiansonDate: 2017-08-21T16:19:54Z MINIFI-388 symlink versioned libcrypto/libssl to non-versioned path so that civet can find them when TLS is used --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---