From e4df21df94360d2d672869854a3cba79f990ea20 Mon Sep 17 00:00:00 2001 From: David Garske Date: Mon, 6 Nov 2017 11:42:22 -0800 Subject: [PATCH] More cleanup for const strings. --- src/ssl.c | 2 +- wolfcrypt/src/asn.c | 48 ++++++++++++++++++++--------------------- wolfssl/wolfcrypt/asn.h | 48 ++++++++++++++++++++--------------------- 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index 1cf34d13c..4bc3e04eb 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -2643,7 +2643,7 @@ int wolfSSL_want_write(WOLFSSL* ssl) char* wolfSSL_ERR_error_string(unsigned long errNumber, char* data) { - static const char* msg = "Please supply a buffer for error string"; + static const char* const msg = "Please supply a buffer for error string"; WOLFSSL_ENTER("ERR_error_string"); if (data) { diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c index 1c3e71bdb..8fa638f13 100755 --- a/wolfcrypt/src/asn.c +++ b/wolfcrypt/src/asn.c @@ -7075,30 +7075,30 @@ WOLFSSL_LOCAL int GetSerialNumber(const byte* input, word32* inOutIdx, -const char* BEGIN_CERT = "-----BEGIN CERTIFICATE-----"; -const char* END_CERT = "-----END CERTIFICATE-----"; -const char* BEGIN_CERT_REQ = "-----BEGIN CERTIFICATE REQUEST-----"; -const char* END_CERT_REQ = "-----END CERTIFICATE REQUEST-----"; -const char* BEGIN_DH_PARAM = "-----BEGIN DH PARAMETERS-----"; -const char* END_DH_PARAM = "-----END DH PARAMETERS-----"; -const char* BEGIN_DSA_PARAM = "-----BEGIN DSA PARAMETERS-----"; -const char* END_DSA_PARAM = "-----END DSA PARAMETERS-----"; -const char* BEGIN_X509_CRL = "-----BEGIN X509 CRL-----"; -const char* END_X509_CRL = "-----END X509 CRL-----"; -const char* BEGIN_RSA_PRIV = "-----BEGIN RSA PRIVATE KEY-----"; -const char* END_RSA_PRIV = "-----END RSA PRIVATE KEY-----"; -const char* BEGIN_PRIV_KEY = "-----BEGIN PRIVATE KEY-----"; -const char* END_PRIV_KEY = "-----END PRIVATE KEY-----"; -const char* BEGIN_ENC_PRIV_KEY = "-----BEGIN ENCRYPTED PRIVATE KEY-----"; -const char* END_ENC_PRIV_KEY = "-----END ENCRYPTED PRIVATE KEY-----"; -const char* BEGIN_EC_PRIV = "-----BEGIN EC PRIVATE KEY-----"; -const char* END_EC_PRIV = "-----END EC PRIVATE KEY-----"; -const char* BEGIN_DSA_PRIV = "-----BEGIN DSA PRIVATE KEY-----"; -const char* END_DSA_PRIV = "-----END DSA PRIVATE KEY-----"; -const char* BEGIN_PUB_KEY = "-----BEGIN PUBLIC KEY-----"; -const char* END_PUB_KEY = "-----END PUBLIC KEY-----"; -const char* BEGIN_EDDSA_PRIV = "-----BEGIN EDDSA PRIVATE KEY-----"; -const char* END_EDDSA_PRIV = "-----END EDDSA PRIVATE KEY-----"; +const char* const BEGIN_CERT = "-----BEGIN CERTIFICATE-----"; +const char* const END_CERT = "-----END CERTIFICATE-----"; +const char* const BEGIN_CERT_REQ = "-----BEGIN CERTIFICATE REQUEST-----"; +const char* const END_CERT_REQ = "-----END CERTIFICATE REQUEST-----"; +const char* const BEGIN_DH_PARAM = "-----BEGIN DH PARAMETERS-----"; +const char* const END_DH_PARAM = "-----END DH PARAMETERS-----"; +const char* const BEGIN_DSA_PARAM = "-----BEGIN DSA PARAMETERS-----"; +const char* const END_DSA_PARAM = "-----END DSA PARAMETERS-----"; +const char* const BEGIN_X509_CRL = "-----BEGIN X509 CRL-----"; +const char* const END_X509_CRL = "-----END X509 CRL-----"; +const char* const BEGIN_RSA_PRIV = "-----BEGIN RSA PRIVATE KEY-----"; +const char* const END_RSA_PRIV = "-----END RSA PRIVATE KEY-----"; +const char* const BEGIN_PRIV_KEY = "-----BEGIN PRIVATE KEY-----"; +const char* const END_PRIV_KEY = "-----END PRIVATE KEY-----"; +const char* const BEGIN_ENC_PRIV_KEY = "-----BEGIN ENCRYPTED PRIVATE KEY-----"; +const char* const END_ENC_PRIV_KEY = "-----END ENCRYPTED PRIVATE KEY-----"; +const char* const BEGIN_EC_PRIV = "-----BEGIN EC PRIVATE KEY-----"; +const char* const END_EC_PRIV = "-----END EC PRIVATE KEY-----"; +const char* const BEGIN_DSA_PRIV = "-----BEGIN DSA PRIVATE KEY-----"; +const char* const END_DSA_PRIV = "-----END DSA PRIVATE KEY-----"; +const char* const BEGIN_PUB_KEY = "-----BEGIN PUBLIC KEY-----"; +const char* const END_PUB_KEY = "-----END PUBLIC KEY-----"; +const char* const BEGIN_EDDSA_PRIV = "-----BEGIN EDDSA PRIVATE KEY-----"; +const char* const END_EDDSA_PRIV = "-----END EDDSA PRIVATE KEY-----"; #if defined(WOLFSSL_KEY_GEN) || defined(WOLFSSL_CERT_GEN) || defined(OPENSSL_EXTRA) diff --git a/wolfssl/wolfcrypt/asn.h b/wolfssl/wolfcrypt/asn.h index ecbc42003..5777e1dd9 100644 --- a/wolfssl/wolfcrypt/asn.h +++ b/wolfssl/wolfcrypt/asn.h @@ -679,30 +679,30 @@ struct DecodedCert { }; -extern const char* BEGIN_CERT; -extern const char* END_CERT; -extern const char* BEGIN_CERT_REQ; -extern const char* END_CERT_REQ; -extern const char* BEGIN_DSA_PARAM; -extern const char* END_DSA_PARAM; -extern const char* BEGIN_DH_PARAM; -extern const char* END_DH_PARAM; -extern const char* BEGIN_X509_CRL; -extern const char* END_X509_CRL; -extern const char* BEGIN_RSA_PRIV; -extern const char* END_RSA_PRIV; -extern const char* BEGIN_PRIV_KEY; -extern const char* END_PRIV_KEY; -extern const char* BEGIN_ENC_PRIV_KEY; -extern const char* END_ENC_PRIV_KEY; -extern const char* BEGIN_EC_PRIV; -extern const char* END_EC_PRIV; -extern const char* BEGIN_DSA_PRIV; -extern const char* END_DSA_PRIV; -extern const char* BEGIN_PUB_KEY; -extern const char* END_PUB_KEY; -extern const char* BEGIN_EDDSA_PRIV; -extern const char* END_EDDSA_PRIV; +extern const char* const BEGIN_CERT; +extern const char* const END_CERT; +extern const char* const BEGIN_CERT_REQ; +extern const char* const END_CERT_REQ; +extern const char* const BEGIN_DSA_PARAM; +extern const char* const END_DSA_PARAM; +extern const char* const BEGIN_DH_PARAM; +extern const char* const END_DH_PARAM; +extern const char* const BEGIN_X509_CRL; +extern const char* const END_X509_CRL; +extern const char* const BEGIN_RSA_PRIV; +extern const char* const END_RSA_PRIV; +extern const char* const BEGIN_PRIV_KEY; +extern const char* const END_PRIV_KEY; +extern const char* const BEGIN_ENC_PRIV_KEY; +extern const char* const END_ENC_PRIV_KEY; +extern const char* const BEGIN_EC_PRIV; +extern const char* const END_EC_PRIV; +extern const char* const BEGIN_DSA_PRIV; +extern const char* const END_DSA_PRIV; +extern const char* const BEGIN_PUB_KEY; +extern const char* const END_PUB_KEY; +extern const char* const BEGIN_EDDSA_PRIV; +extern const char* const END_EDDSA_PRIV; #ifdef NO_SHA #define SIGNER_DIGEST_SIZE WC_SHA256_DIGEST_SIZE