From 08bb38885f18b15b3bc8269f5d814bf046485e08 Mon Sep 17 00:00:00 2001 From: Georg Richter Date: Mon, 3 Mar 2014 17:10:00 +0100 Subject: [PATCH] Fix for CONC-81: crash in ssl connection (caused by fix for CONC-79) - prevent zeroing cache paraemters in vio_reset --- libmariadb/violite.c | 5 +++ unittest/libmariadb/certs/ca.pem | 44 ++++++++++---------- unittest/libmariadb/certs/client-cert.pem | 22 +++++----- unittest/libmariadb/certs/client-key-enc.pem | 30 ++++++------- unittest/libmariadb/certs/client-key.pem | 26 ++++++------ unittest/libmariadb/certs/server-cert.pem | 22 +++++----- unittest/libmariadb/certs/server-key-enc.pem | 30 ++++++------- unittest/libmariadb/certs/server-key.pem | 26 ++++++------ 8 files changed, 105 insertions(+), 100 deletions(-) diff --git a/libmariadb/violite.c b/libmariadb/violite.c index eb1a3c7d..2efb4cb6 100644 --- a/libmariadb/violite.c +++ b/libmariadb/violite.c @@ -81,11 +81,15 @@ void vio_reset(Vio* vio, enum enum_vio_type type, my_socket sd, HANDLE hPipe, my_bool localhost) { + uchar *save_cache= vio->cache; bzero((char*) vio, sizeof(*vio)); vio->type= type; vio->sd= sd; vio->hPipe= hPipe; vio->localhost= localhost; + /* do not clear cache */ + vio->cache= vio->cache_pos= save_cache; + vio->cache_size= 0; } void vio_timeout(Vio *vio, int type, uint seconds) @@ -252,6 +256,7 @@ size_t vio_read(Vio * vio, gptr buf, size_t size) memcpy(buf, vio->cache, r); } } + #ifndef DBUG_OFF if ((size_t)r == -1) { diff --git a/unittest/libmariadb/certs/ca.pem b/unittest/libmariadb/certs/ca.pem index 35720367..ce93f60a 100644 --- a/unittest/libmariadb/certs/ca.pem +++ b/unittest/libmariadb/certs/ca.pem @@ -1,30 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAKKW9xg1tcRqMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAOzGST1sgGjAMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZzZXJ2ZXIwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK +DAZzZXJ2ZXIwHhcNMTQwMzAzMTIxNTM5WhcNMTQwNDAyMTIxNTM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nRTqi6l32vyj -w7wrwMz3pnE3Wn7H87RavltILsGvtfuyZhEnqp6OZ+3pzNYPhSRTBD+jUjn4Rxcw -oDHhKuQGAr3SgD+EVk3KyiOLR2pqvBPsexzIpsSvmrQnGeWBnBx7Y8MBfOQx/San -nkjZTP+Txrc2j0327DaYjSmUW/0WCwIDAQABo1AwTjAdBgNVHQ4EFgQUBCtogVAU -ubcpj3eqI/CGzC5PDiowHwYDVR0jBBgwFoAUBCtogVAUubcpj3eqI/CGzC5PDiow -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCpL+8mSXpjRX28aGsCEFaS -2x1AJ8YdRUyEwUabdOju4OMfgfPWXO1GQKnGx1+z1vqoalbFrwbzQgtEVBoFtVKq -2sVQfjoaexAFFtv2XLIK/cyaQNq/MSeIepbrq3fwinCkYj3IPJDoaeH/UqqkdFVD -EFDctLWfASK3BfIrH5lx8Q== +AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJtK0qYQIWmTU5 +poKhvoSuMi26oPNpu+zYQ3NTKueY3xs03zRIhuJ5khI6t5/oRNRExDL/CU4609IT +to7YnDByUlBftTPHujsEuW6GDAzVlmpGNuBYO5oLNBGL3f5BF0eDh37vQEYyr67M +TR0mqPkd8IeztK0iCaJNXB7lTyyRcwIDAQABo1AwTjAdBgNVHQ4EFgQUlPvBMFAZ +XqTPqYsVautG+QomU74wHwYDVR0jBBgwFoAUlPvBMFAZXqTPqYsVautG+QomU74w +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQB7Tu43BPt82IYShXH9FoYR +WWqG2PI5BrN32VcTKEP/cZf7QNrPuungjnHne1VMVIN4dfB8QWB4Uvjq5f5kWunI +BY1YpPFNy+5p+sUAHX9H4rJloVwNLYSKWPhEpe/zSKSTuPGqbAhYv8M/lMQlp58w +oICORfoW3HruDjRnJxTAPw== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAMt+ApSrJ+XnMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAKPJnSVjrc7LMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZjbGllbnQwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK +DAZjbGllbnQwHhcNMTQwMzAzMTIxNTM5WhcNMTQwNDAyMTIxNTM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPJvYTivFQCoNX -XBQTBp6dN9W+Fc4lceC/xUMPw1ZBGH6pXUgTPqdsstn2sF0L0GnYJftOibiwJm0f -j1A1d92muFLs/4H7mTsL3MHWAbfbEgR5D+IBhm/fW/EONOXLwk6vaoHPF2FbrLnT -XDAlnPGF4Xwy9k8ClWyZQS+vDzFT5wIDAQABo1AwTjAdBgNVHQ4EFgQUNQtkyITI -+jt/TLiJzFuWB0yptfMwHwYDVR0jBBgwFoAUNQtkyITI+jt/TLiJzFuWB0yptfMw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQDNEJArJ/cTucQrPvZpyjhA -5pgJEa32bMck1N6tz7Ie6LxB7YksieL3Xpo+FJA9VrqfH/sgYFo55ZLNaTVUBBjr -4ooySTOF4JFRUa4KL//Fsl13ZUwxWHH9OONNSIryF/cDy7ofxxu4CQZNEv7FlxBI -s2Be7X4qxS4sjKrdE1QsiQ== +AwwGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW1pzU0Rgd631H +L4C2wB2hoIzwFxKcqHJk6MxZMcCFjH3EFyo7+hn42Hpz2bkibgsn9/Kcg2Y32cgK +B1rWmerD8cU0dMcqxImZwyg5//s0tX2UjleZRnVTs5JEqFjSZSool0MHGKXnp8Bc +t4F4d5hduT2WxXcRG+ltzATEV2A79QIDAQABo1AwTjAdBgNVHQ4EFgQUVcbFkeIN +mXA+BmOy8AFkgDSFTUswHwYDVR0jBBgwFoAUVcbFkeINmXA+BmOy8AFkgDSFTUsw +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQANxUnH8UXd2vo83DQPh6+I +E4J7DYn1D4pC3WXWQXIPXHvkmuuJnZcmapS4mgK932SyteALM4u5D01rvtpV76we +sgPZHXDPXDimT62AScYgO8LpvEcmaYtw1zgxXRnC+o6DHNOvoG5iaV7kVo3wzr3B +qtgFiFBvZYHTZ+hVAkk19Q== -----END CERTIFICATE----- diff --git a/unittest/libmariadb/certs/client-cert.pem b/unittest/libmariadb/certs/client-cert.pem index 69a4d194..a4718952 100644 --- a/unittest/libmariadb/certs/client-cert.pem +++ b/unittest/libmariadb/certs/client-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAMt+ApSrJ+XnMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAKPJnSVjrc7LMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZjbGllbnQwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK +DAZjbGllbnQwHhcNMTQwMzAzMTIxNTM5WhcNMTQwNDAyMTIxNTM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDPJvYTivFQCoNX -XBQTBp6dN9W+Fc4lceC/xUMPw1ZBGH6pXUgTPqdsstn2sF0L0GnYJftOibiwJm0f -j1A1d92muFLs/4H7mTsL3MHWAbfbEgR5D+IBhm/fW/EONOXLwk6vaoHPF2FbrLnT -XDAlnPGF4Xwy9k8ClWyZQS+vDzFT5wIDAQABo1AwTjAdBgNVHQ4EFgQUNQtkyITI -+jt/TLiJzFuWB0yptfMwHwYDVR0jBBgwFoAUNQtkyITI+jt/TLiJzFuWB0yptfMw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQDNEJArJ/cTucQrPvZpyjhA -5pgJEa32bMck1N6tz7Ie6LxB7YksieL3Xpo+FJA9VrqfH/sgYFo55ZLNaTVUBBjr -4ooySTOF4JFRUa4KL//Fsl13ZUwxWHH9OONNSIryF/cDy7ofxxu4CQZNEv7FlxBI -s2Be7X4qxS4sjKrdE1QsiQ== +AwwGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCW1pzU0Rgd631H +L4C2wB2hoIzwFxKcqHJk6MxZMcCFjH3EFyo7+hn42Hpz2bkibgsn9/Kcg2Y32cgK +B1rWmerD8cU0dMcqxImZwyg5//s0tX2UjleZRnVTs5JEqFjSZSool0MHGKXnp8Bc +t4F4d5hduT2WxXcRG+ltzATEV2A79QIDAQABo1AwTjAdBgNVHQ4EFgQUVcbFkeIN +mXA+BmOy8AFkgDSFTUswHwYDVR0jBBgwFoAUVcbFkeINmXA+BmOy8AFkgDSFTUsw +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQANxUnH8UXd2vo83DQPh6+I +E4J7DYn1D4pC3WXWQXIPXHvkmuuJnZcmapS4mgK932SyteALM4u5D01rvtpV76we +sgPZHXDPXDimT62AScYgO8LpvEcmaYtw1zgxXRnC+o6DHNOvoG5iaV7kVo3wzr3B +qtgFiFBvZYHTZ+hVAkk19Q== -----END CERTIFICATE----- diff --git a/unittest/libmariadb/certs/client-key-enc.pem b/unittest/libmariadb/certs/client-key-enc.pem index 13c5de18..cf5bbff6 100644 --- a/unittest/libmariadb/certs/client-key-enc.pem +++ b/unittest/libmariadb/certs/client-key-enc.pem @@ -1,17 +1,17 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI8Kc5JKCh4q0CAggA -MBQGCCqGSIb3DQMHBAgyrAbeBzJxAgSCAoCaMi5KH3zYFuXZeqbMhwiar5ETjy38 -YkPP12Ko2IDOydiU7oZzKbwWBrlSLUTolHn9AePjA9mOAEx76CsBUIUE3EmSb17C -VzBdhPgawRt/PNVp+rTr8mLv1Lb1UEevsyU3j5RXBurdSN1afJ2801RJZ6id1/g1 -wtqM8BMpET+wiqnakuh7qHrcupOroQB4DKc3mKCawFXO7nCKfONbK8XstF0eVjKZ -NhgoJ6gk2kHgnSKsTX5jLvZ3cYHIPLVWZqiJZ11yvxRuDOkMvPrBg3XFyjXqemTP -jjHWKmetz9oLAuGNfCNiZ/MY+qxBfH0kV8KH4myhS8o5dWRJeY80hz2EwZT2swSq -7UHpgZzZ8DWJhagxWwZJoYWljY8tsOS6k4GsYnr1tBtW109HVDFcUWbU8oy+oTsy -cfAuJRV3NjQxTqC2z6sYx1n8aEl1am21SYjdMl+C4AXJrwxqJle/jyymYE0hcEAy -TfKvoZYx6l92cbQpImTPRIOEdF7fwogtS33zG+XqlZvm/qKbUgX6XL9DZXfSCJfo -ovlfNMPP6PTehRRSTXQedjieJ7XTCqBJR7UNWuFQZa7Q9q0mQac2NZmKuGt8FNjn -YwfBrTQWofAl0/SYM81NVZ6icKAY9ulHvKBW8n43XRBewH2aXFx+SO1vpO4GMMXq -/22Amo6TuoOT7+VLwBdT6S8ERfImoPoBaLR2dT2L/kcxzUiayWEmc+CIzWmViwmP -o8myih+H1EE68nsj02ZysWSbQ9I0J4tj5QyR3J0FgqP2fWZUDncZ+iDNOgHZWLK8 -VjTjm6bP3n2Kxy3UAumcXeldYGaOcXxI6mBrtibrBz8A9sLK35qwoX8A +MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIdzt3UBGdGKwCAggA +MBQGCCqGSIb3DQMHBAi3EQ5NVU79qASCAoAxZFIJr9LVbcP+g/E7xCKmaaNgMfWw +eLiIuJwZTgtFsb4CWG5pSGc1P+WP/4Blm2g9awnSOeIh9h4Rz1ZCeB4ztqZvTmqh +MRsZc6Bp+CTslQdkPT07pATzesF46Cp4kB2prC5/lYBxydtafvMeDQOHxGqAjYwW +6iqHrq2OGrJZkVYp5Jmg9Taj5uOXoUTLWvYtUVB/pHfe9TUFPYuhzNWv+8daG36Q +gxUNMP049TNgQmYSX3R2XSizwVwLiq51KQ8awhOjRAzvZg8Bj6stTgDge+JspajR +YZItn7+I/x4kv2M6/S2NnaXFjOnFB4ivr7BFGQhEM3drvE1hZw8LhYq1lFBFZeO/ +HXMeRIv95touqEvukoUT2E1lgsBiQ9EkpmH+mFQmqd8RHwxA2xVfx+WQo7wtPJ2e +oezWOybQRK1tMxnF+np70VyyfBo4Y0JZ4ac19lm0wsfLdIJ9+H91WfNTAdGwaqLf +yUEGRPpzIoCg2fw71mchZ8y3aknEWVMTcQsXlE8z5ZQv/m+x/2mK1Lw5Zg7MpOVi +742XN7cFmH/uBfE2CndODqOOt7Sn9zw/S7auDOrE0qjrxAaW0p0Xby38lvL3e7fj +/7qDf7dj/0vuOPxdEGWuhmUgM2ZXInxg6yGmmLDM15rbX613lWo1qmPKjl5MROSJ +aKvXf7bG5cGbZ/sdkoISykWb7W/lH2NyMWKv5tGsKCtkC/0I5aUFMk1p4FE4uky4 +cZauUBJ1itNcXR80u3B76siRFgGKLFFgfTioblGSxIQ2cFqq3lY8f4ZcW+JjWZug +g5p83DmIf7GCfjeuI4MYWYVcVu4kGCGtFmbZc54DalFEWZ3valr8C9l1 -----END ENCRYPTED PRIVATE KEY----- diff --git a/unittest/libmariadb/certs/client-key.pem b/unittest/libmariadb/certs/client-key.pem index e74aae0c..bf055cee 100644 --- a/unittest/libmariadb/certs/client-key.pem +++ b/unittest/libmariadb/certs/client-key.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDPJvYTivFQCoNXXBQTBp6dN9W+Fc4lceC/xUMPw1ZBGH6pXUgT -Pqdsstn2sF0L0GnYJftOibiwJm0fj1A1d92muFLs/4H7mTsL3MHWAbfbEgR5D+IB -hm/fW/EONOXLwk6vaoHPF2FbrLnTXDAlnPGF4Xwy9k8ClWyZQS+vDzFT5wIDAQAB -AoGAcCzX+nM2A7L9trPdBwSBpf9TVpD2Rd6p5w8KJqIPtkZuaIZj/k/iWAFt+KE+ -caRVfL/sm3YGthTI6NsxgxK6ypECS0kkN7QRm+aLJ18viZafu6Wc2igcunNYDZHC -3KOc9U8WDnZAS/CcHNLi/QCf9FEtSTaiErOr4n56Nya8usECQQDn6TIekb1JZZmN -z9Pi1MhC3yJpCCa8HrNuapEllvoMv5PH+9i5ua/yS+K86uyAKpMCUV4SM7gFqtL3 -FQufGkshAkEA5KtmTBWNgb+77aRbBHUXQGNooe2DWw6NA4tmywWSBIy+E03D5eBh -yl70UMKO+j8VMyoJCbzFMz1RrGIGo2aGBwJBAM1g2JD38lEo2Acd0YDlfgCyyS+J -F3ysF62mVKqcfQ+DLeYCZFl+V5JVoBQ8XHvYuF5qHswx3zutn61Phv488+ECQQCr -3o/S29gyD1RGt2OZpBBH2u/H1WcHR5aBdYNbUOKA/O/YPnjhDJczrc7f7HveZw+e -FxgX84QckRgUAtGOev59AkEArPUfgxLjE2N11jk+1Pv4+mBHBIcv30evSJKD5I52 -Oi3SoMwTjm0iWKSZtBI7XMtmjlEYjg+GF/FNWNgjW97LCg== +MIICXAIBAAKBgQCW1pzU0Rgd631HL4C2wB2hoIzwFxKcqHJk6MxZMcCFjH3EFyo7 ++hn42Hpz2bkibgsn9/Kcg2Y32cgKB1rWmerD8cU0dMcqxImZwyg5//s0tX2UjleZ +RnVTs5JEqFjSZSool0MHGKXnp8Bct4F4d5hduT2WxXcRG+ltzATEV2A79QIDAQAB +AoGAYsK2AOm+3qg3aIqDviRfwlm6reCNgSERdVyvn57hrQ9lsSRxtL92jeY/lubx +PsfKaisAINYv8VWYkmhqY6R3fz7T2xmu0raSLS953dcs03oknnTJX6cOxkms9wtw +AHVyAF5Lti0uEWS9LxxcJR7TAGI5UkJSQ88uWZeawH4XYgECQQDE+w49yaaEDcFN +wLOWJIKTkBhvLkc76mI56kBgJS3rdG6/2EVJjwCQmPFUFaZpgqcsWZTZ2AlfhUAq +bVl2Fg41AkEAxAhQrvFR3eupSy7RCqQ+X/kmlco1UYLtzCiFAGOV7wWlstVLbT76 +i/DClvvLZzQuGed6ELn4xsuHN3Fan6ouwQJBALH53F47anZ6LyPfbuPDzS8izND3 +0WjzVxjY7J1yOlE5fC9eawwRZwM/DR1aCmfeoslRj0pdBesGbHlpH6GwP9kCQAxc +Cdo91M+NICthVES7fkNGziv7h8kP3DZXB6uym61qSbwwvoSwx9My5tHmJjjnjVCM +y6FqWEkQZAIW34PZkwECQDd6osrGUSGcGbo324mwLTz4Qa1G96nX5U20vOXyJ0hb +JJBl9rnl/dDN7MA6PWWArJqJY9AERQ8NUgMTloQlwi0= -----END RSA PRIVATE KEY----- diff --git a/unittest/libmariadb/certs/server-cert.pem b/unittest/libmariadb/certs/server-cert.pem index a5674fe8..3addb43f 100644 --- a/unittest/libmariadb/certs/server-cert.pem +++ b/unittest/libmariadb/certs/server-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAKKW9xg1tcRqMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAOzGST1sgGjAMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZzZXJ2ZXIwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK +DAZzZXJ2ZXIwHhcNMTQwMzAzMTIxNTM5WhcNMTQwNDAyMTIxNTM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nRTqi6l32vyj -w7wrwMz3pnE3Wn7H87RavltILsGvtfuyZhEnqp6OZ+3pzNYPhSRTBD+jUjn4Rxcw -oDHhKuQGAr3SgD+EVk3KyiOLR2pqvBPsexzIpsSvmrQnGeWBnBx7Y8MBfOQx/San -nkjZTP+Txrc2j0327DaYjSmUW/0WCwIDAQABo1AwTjAdBgNVHQ4EFgQUBCtogVAU -ubcpj3eqI/CGzC5PDiowHwYDVR0jBBgwFoAUBCtogVAUubcpj3eqI/CGzC5PDiow -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCpL+8mSXpjRX28aGsCEFaS -2x1AJ8YdRUyEwUabdOju4OMfgfPWXO1GQKnGx1+z1vqoalbFrwbzQgtEVBoFtVKq -2sVQfjoaexAFFtv2XLIK/cyaQNq/MSeIepbrq3fwinCkYj3IPJDoaeH/UqqkdFVD -EFDctLWfASK3BfIrH5lx8Q== +AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJtK0qYQIWmTU5 +poKhvoSuMi26oPNpu+zYQ3NTKueY3xs03zRIhuJ5khI6t5/oRNRExDL/CU4609IT +to7YnDByUlBftTPHujsEuW6GDAzVlmpGNuBYO5oLNBGL3f5BF0eDh37vQEYyr67M +TR0mqPkd8IeztK0iCaJNXB7lTyyRcwIDAQABo1AwTjAdBgNVHQ4EFgQUlPvBMFAZ +XqTPqYsVautG+QomU74wHwYDVR0jBBgwFoAUlPvBMFAZXqTPqYsVautG+QomU74w +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQB7Tu43BPt82IYShXH9FoYR +WWqG2PI5BrN32VcTKEP/cZf7QNrPuungjnHne1VMVIN4dfB8QWB4Uvjq5f5kWunI +BY1YpPFNy+5p+sUAHX9H4rJloVwNLYSKWPhEpe/zSKSTuPGqbAhYv8M/lMQlp58w +oICORfoW3HruDjRnJxTAPw== -----END CERTIFICATE----- diff --git a/unittest/libmariadb/certs/server-key-enc.pem b/unittest/libmariadb/certs/server-key-enc.pem index 4579a4d6..2ef778af 100644 --- a/unittest/libmariadb/certs/server-key-enc.pem +++ b/unittest/libmariadb/certs/server-key-enc.pem @@ -1,17 +1,17 @@ -----BEGIN ENCRYPTED PRIVATE KEY----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQISLmgyJIIYeUCAggA -MBQGCCqGSIb3DQMHBAiXr9uBzGDG9ASCAoDqB42S74G7+v+6ITyd2AmiNVVmInmF -AmbGDk/LwltMwZlUhR1DebuKmyGCbCfKtjAGPfWHcsO03H5QT3qv4mTjzv9JHNgh -/PLYKzDD8InWOp97BxT4WaEb7mPIPEG9XO7gxMgp2q/5CAO335VQSDRiniQgE6zV -SKIHhThDj760Juh6sPj0Il/CgQT07ZABRrsCl9aJSdktYodgkBHlsoWrRTP8WRE/ -0Hg2ta90nB6v/+LIIhZM1qqDksKK9DlVTupYET52FRHhuIlvETSOFg8QDAfyktSQ -zdJuI0MTnhFj77ZdCYMXqgm+SnU+wo/FRv6C7Q5HABY4S0+Ik34LVLRe/0zpvQXe -omq2dxDGpG7n0xmmKZeVoIcw7Rh60dlOOY9o//yFlVO3+sp3b2Jfm5t3Y3ZWqtB0 -Bk5mnQviZrZWnCMx4ftgILCMPTWUxpJI2kiJRfabTgWwjBohd3TVQ0lHayA6y/hR -j1Y1afslQrx3kOF6FjJ+XM4wJW0gOnJz/usEBT37UuPmd/nGhqp2AqtLDUtpt7aE -0x6MmK8pLTlnaRnRxox18YkQa3rzn5VbBI8nJ3g0048s1udrO//5y0fQ2ynln/KZ -4ZIfBiePpme+wK6T5iopy3jjMQ7hxp6xC7zgZiS6IuQyXy51zZ+DanHDyBuanpzc -mqliHwV6x2ciyGvWllOVscajdLtudF3tHv8gviumnC8z5N6UPph5FbTWA0xJKR/w -sgwbRT26iflnwN6k3PYQWaVqpZ7bDgvyO9rT8hyM6zNCZcHoPwquH6WcaUy43MXn -zFxQFxFr7YCrltrWYroeR2kwbcTnldSP58bDHXfWSaG0KdL/Hyj3K6KT +MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIPpJdGdXjQRACAggA +MBQGCCqGSIb3DQMHBAiUKNGTStSZLQSCAoC98JfG2THDxTwONDo/2cEwC2nmPiOt +zptOrZBGEss9O+yt85JUge47Hidvf/O98/4zOAaOOwvt7Sq4Sosr+xovHYpvyYl1 +O4K5YMeS/Nx+lS5qcX6nKTuz/Nh69PTzn+cOT61ZYHTjXrcAMDKRbmcZTuN07ZXY +toZOdQomJ5ivvh4zQqufk0VbtQ53Cy2OYvY+Zm42lmowWwSfJZbIWEfBxp/PUrap +LyG9lDvcUJopcMcQ7cDg65M6fZoE1RjF1ACsPnmMzJJrlVgkYyDwKl0cXEaBIja+ +zA0iWbyHqre8sOD7Fv1PCTPhqOQ0eLU9RttPaw0YuPU4wx7Czlqkumzf4wZnYVe+ +rerh1/KjV/KyekcfrxNWaiLgiLVTDxGAFTU7wj7jKneMG2qTD/bvLRfcoiWH+1vK +agyzL4wu2X0RyZQqPm3YbGl/ye/gusJmCpxR2vDD3dNw/pNi7jl/oZZnrUuV4VJQ +xnaKQMcGm97UciGXg0S5rNPdZcSvbbU02pbj8B4Eg2QQXfFXI7UUxEWAcyP22YXj +kAy1y7rI+9MDUX+pss7oncWD/meE+3X5qRorhvH3hN6UvDHCSL8g4iOlwjFA7IV+ +IPQw+QKJkBxNkj2/esV1GcDgeTKF+ybCnGZK5TANg68eArawWOmv/pYSsubsGfTn +l5hcQF8zmm/p12KXxhJp21jyCHYiVXB8oAJXbAKssvnGZfkEo4vOmZiMsLCVsZI6 +1Pyo9G/c8W9DjaXZmgiN2APQciiRXkv87nru0d9zeiEiZRaTIC2xQuAojQZ4wLGl +8eu7oqo/ebyi174UEAeNW8l/QUeMJVCyBKdbKKeRmZUzzJx0BJLMJskK -----END ENCRYPTED PRIVATE KEY----- diff --git a/unittest/libmariadb/certs/server-key.pem b/unittest/libmariadb/certs/server-key.pem index a38b7264..c6f5b154 100644 --- a/unittest/libmariadb/certs/server-key.pem +++ b/unittest/libmariadb/certs/server-key.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQC2nRTqi6l32vyjw7wrwMz3pnE3Wn7H87RavltILsGvtfuyZhEn -qp6OZ+3pzNYPhSRTBD+jUjn4RxcwoDHhKuQGAr3SgD+EVk3KyiOLR2pqvBPsexzI -psSvmrQnGeWBnBx7Y8MBfOQx/SannkjZTP+Txrc2j0327DaYjSmUW/0WCwIDAQAB -AoGBAJlpc5XrSK6hMRcfK+kR6t+uW3SmONYgHYcSXjtQ1HSaDN59srHBO7zlANEm -vTqCntaDPjclr/+tMYUvP1groS0jNJDPDH07lQYiNTVMDBlYpBDBpetoxve78jKJ -0mpK69SaNd8/eJJHeO8wm1/zWqPRkaMPLMoiy5bVDO8YYmFZAkEA6Sa+tKG6+ygZ -/fXuRF9VvTBC6o+CBY7Tk9KJ2/+dvSa2rvRrUNc65h988peC3SlJqCq8lMovoFVj -y0AvagrgXwJBAMiCdKo4e0z+BT18W9cS2ZGXRlmhe7xUmxIS0e2BI6njMeeoqUt4 -PX3DQRzFfdqWX6MlxAfvQDbn9F6mgd/M+dUCQAg0Js2wSyX/OTroZmPdfuTTR+d8 -+TQ83FD9PYCSM/it3gu16fjEOfxS61CV6DLj+wWBy3To0Fgx6PsD3Sc8Dr0CQCfW -a5GKaU0Rxz7BH4oqz5lyoeKbB/eSI8FChf0XRFuzrS2mwAQjnqwHCD/MKUYtzFCg -50LgUTTXfyDzGii6FAUCQQCVa1n8mXArxENQ24v2TiGGC42ovw8c0qeC69HyjmgB -lSQJMxQSaqbx7krReu2tVfORN9UnoU9WurY/xIS0EQNb +MIICXwIBAAKBgQDJtK0qYQIWmTU5poKhvoSuMi26oPNpu+zYQ3NTKueY3xs03zRI +huJ5khI6t5/oRNRExDL/CU4609ITto7YnDByUlBftTPHujsEuW6GDAzVlmpGNuBY +O5oLNBGL3f5BF0eDh37vQEYyr67MTR0mqPkd8IeztK0iCaJNXB7lTyyRcwIDAQAB +AoGBAJk+Yp2i7BI9PhnZrr+x3l32E5YJ+ETpmMzJmhGitCgJwULPHYrIp8HTP3RK +0/uEZ30DTvdCm6PIEIAXn7lkGM04YcnaerXIHBSwNQKIhyniNDfBfqox6azQaCDy +wTFSgghU1SNOn6+ZOCXeGtp4Y7cXEWzPWfI0UJ9HopY0k+HZAkEA8UuJ87/JwMjk +t4lB6ml+YgQw9MGrxAsdJrLzqvWo68Jd1g2Le6ghcRRTsx9KJo6b1P+63jxk6jnj +ZMywLJL2nwJBANX/gIYXeDgsNkoFn3T6YPteatMPup5bT4t1sYRDZbKQj+rDVDYL +PuwK6kIO4xQ6UId9UclfOVb7rwpsJa8jGK0CQQCj6SN6EBNWQWGVB8leGnF+1cgH +y7QJxV71FeUOgjhQhsVFjgftZUXqUduVtzCgxok3BM0FAFOxBMfihmU6sk6TAkEA +ixQ4Em30awWI7wjCfoMvPo85fByv27VaeDewfFZVJP1BG4GBHHKonT3my7HjMUVJ +CxWObwKdQIPoWiy5PR7hLQJBAJxTKKgO5EVXUAv+gEmt+zTIKbTRyAWUcx/Ee4or +ZHMwsQMtW95EKiakNYZ9lCZwLeyRF3I9iNn7RirresRan+I= -----END RSA PRIVATE KEY-----