Changeset 2089

Timestamp:

12.01.2012 14:20:58 (4 months ago)

Author:

x.pechoultres@…

Message:

Update OpenSSL

Location:

trunk/modules/Openssl/source

Files:

• common.cl (modified) (1 diff)
• key.cl (modified) (2 diffs)
• pkcs7.cl (modified) (1 diff)
• ssl.cl (modified) (1 diff)
• x509.cl (modified) (1 diff)

trunk/modules/Openssl/source/common.cl

@@ -208 +208 @@
         let len := length(self)
         in (externC("ASN1_OCTET_STRING* asn1 = ASN1_OCTET_STRING_new()"),
-                externC("PCCONST unsigned char *buf = (unsigned char*)self"),
+                externC("const unsigned char *buf = (unsigned char*)self"),
                 externC("d2i_ASN1_OCTET_STRING(&asn1, &buf, len)"),
                 let res := copy(externC("(char*)asn1->data", string), externC("asn1->length", integer))

trunk/modules/Openssl/source/key.cl

@@ -260 +260 @@
                 len := length(self),
                 x := key()
-        in (if (externC("((x->evp_key = d2i_PublicKey(EVP_PKEY_RSA,NULL,(PCCONST unsigned char**)&buf,len)) == NULL)",integer) = 1)
+        in (if (externC("((x->evp_key = d2i_PublicKey(EVP_PKEY_RSA,NULL,(const unsigned char**)&buf,len)) == NULL)",integer) = 1)
                         openssl_error!(),
                 x)]
@@ -270 +270 @@
                 len := length(self),
                 x := key()
-        in (if (externC("((x->evp_key = d2i_PrivateKey(EVP_PKEY_RSA,NULL,(PCCONST unsigned char**)&buf,len)) == NULL)",integer) = 1)
+        in (if (externC("((x->evp_key = d2i_PrivateKey(EVP_PKEY_RSA,NULL,(const unsigned char**)&buf,len)) == NULL)",integer) = 1)
                         openssl_error!(),
                 x)]

trunk/modules/Openssl/source/pkcs7.cl

@@ -91 +91 @@
                 len := length(self)
         in (externC("p7->p7bio = NULL"),
-                if (externC("(int)d2i_PKCS7(&p7_star, (PCCONST unsigned char**)&self, len)", integer) = 0)
+                if (externC("(int)d2i_PKCS7(&p7_star, (const unsigned char**)&self, len)", integer) = 0)
                         openssl_error!(),
                 p7)]

trunk/modules/Openssl/source/ssl.cl

@@ -41 +41 @@
                                 Core/fd = Core/connect(addr, p),
                                 Core/tcpport = p)
-        in (externC("SSL_METHOD *meth=SSLv3_method()"),
+        in (externC("const SSL_METHOD *meth=SSLv3_method()"),
                 if externC("(meth==NULL ? CTRUE : CFALSE)",boolean)
                         error("Couldn't create SSL method for ~A:~S", addr, p),

trunk/modules/Openssl/source/x509.cl

@@ -148 +148 @@
                 len := length(self),
                 x := X509()
-        in (if (externC("((x->x509_star = d2i_X509(NULL,(PCCONST unsigned char**)&buf,len)) == NULL)",integer) = 1)
+        in (if (externC("((x->x509_star = d2i_X509(NULL,(const unsigned char**)&buf,len)) == NULL)",integer) = 1)
                         openssl_error!(),
                 x)]