diff options
| author | rhe <rhe@ruby-lang.org> | 2016-05-24 12:39:57 +0000 |
|---|---|---|
| committer | Kazuki Yamaguchi <k@rhe.jp> | 2016-05-31 11:31:27 +0900 |
| commit | 5783408e86d4dd145e3263669f54f7269e00c500 (patch) | |
| tree | 020a9370429b2af4b9636a4a2a55c5708fdd3a66 /ext/openssl/ossl.h | |
| parent | e655faa38cdfbdd2da56c0b8db3a3fbb7094fa68 (diff) | |
| download | ruby-openssl-5783408e86d4dd145e3263669f54f7269e00c500.tar.gz | |
openssl: avoid deprecated M_ASN1_* macros
* ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): Use
ASN1_OCTET_STRING_set() instead of M_ASN1_OCTET_STRING_set(). Macros
prefixed by "M_" are discouraged to be used from outside OpenSSL
library[1].
(ossl_x509ext_get_value): Likewise, use ASN1_STRING_print() instead
of M_ASN1_OCTET_STRING_print().
[1] https://git.openssl.org/gitweb/?p=openssl.git;a=blob;f=CHANGES;h=bf61913d7b01212b4d8b2f3c13d71d645914f67c;hb=b6079a7835f61daa9fb2cbf9addfa86049523933#l878
* ext/openssl/ossl.h: Include openssl/asn1.h instead of
openssl/asn1_mac.h. It just includes openssl/asn1.h and defines some
additional "M_" macros.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55145 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl/ossl.h')
| -rw-r--r-- | ext/openssl/ossl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 25f2c857..8da2ab47 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -54,7 +54,7 @@ extern "C" { #endif #include <errno.h> #include <openssl/err.h> -#include <openssl/asn1_mac.h> +#include <openssl/asn1.h> #include <openssl/x509v3.h> #include <openssl/ssl.h> #include <openssl/pkcs12.h> |