diff --git a/include/global.h b/include/global.h index e51af17a..72667c15 100644 --- a/include/global.h +++ b/include/global.h @@ -722,8 +722,8 @@ typedef union { double v; long m[2]; } doubleget_union; -#define doubleget(V,M) { ((doubleget_union *)&V)->m[0] = *((long*) M); \ - ((doubleget_union *)&V)->m[1] = *(((long*) M)+1); } +#define doubleget(V,M) { ((const doubleget_union *)&V)->m[0] = *((long*) M); \ + ((const doubleget_union *)&V)->m[1] = *(((long*) M)+1); } #define doublestore(T,V) { *((long *) T) = ((doubleget_union *)&V)->m[0]; \ *(((long *) T)+1) = ((doubleget_union *)&V)->m[1]; } #define float4get(V,M) { *((long *) &(V)) = *((long*) (M)); } diff --git a/libmariadb/my_stmt.c b/libmariadb/my_stmt.c index 46f1a02e..c4888e74 100644 --- a/libmariadb/my_stmt.c +++ b/libmariadb/my_stmt.c @@ -455,9 +455,8 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p) } else if (t->day || t->hour || t->minute || t->second) len= 8; - t_buffer[0]= len; + t_buffer[0]= len++; memcpy(*p, t_buffer, len); - len++; (*p)+= len; break; } @@ -478,7 +477,7 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p) */ MYSQL_TIME *t= (MYSQL_TIME *)stmt->params[column].buffer; char t_buffer[MAX_DATETIME_STR_LEN]; - uint len= *stmt->params[column].length; + uint len; int2store(t_buffer + 1, t->year); t_buffer[3]= (char) t->month; @@ -495,9 +494,10 @@ int store_param(MYSQL_STMT *stmt, int column, unsigned char **p) len= 7; else if (t->year || t->month || t->day) len= 4; - t_buffer[0]= len; + else + len=0; + t_buffer[0]= len++; memcpy(*p, t_buffer, len); - len++; (*p)+= len; break; } diff --git a/unittest/libmariadb/certs/ca.pem b/unittest/libmariadb/certs/ca.pem index 8fd79fc7..35720367 100644 --- a/unittest/libmariadb/certs/ca.pem +++ b/unittest/libmariadb/certs/ca.pem @@ -1,30 +1,30 @@ -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAMc8o9u+bopUMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAKKW9xg1tcRqMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZzZXJ2ZXIwHhcNMTMwOTE4MTQ1MjE3WhcNMTMxMDE4MTQ1MjE3WjA/MRMwEQYK +DAZzZXJ2ZXIwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSnS+kxI2wBY1M -eINRxfpyx5BQ8x4hX8o79PT+1PpEYEt/aNL1D2LronG4tbpB6pFTJ+mxnbPAOhns -nGEpYYh5Tz1VOcB1+IMko/Eqa4jComxb1Yxv3c1xbtFNyGaylOCQ1KHs60UNDL8K -eZs827ys293jPjR7Kz3fzTfPRCgc3wIDAQABo1AwTjAdBgNVHQ4EFgQUDYVv8BN8 -pzV3lwVpUzg1zSFLm9UwHwYDVR0jBBgwFoAUDYVv8BN8pzV3lwVpUzg1zSFLm9Uw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBkU+Vx9Qkx/l/covoosxUl -xigDiZf0WZhsBNudu3aB5OV08eXLdkPxnF/nmTotiK+FvmIAh1fM65mMLlxbfRpH -3kAlI470shYEaysC1aIgcdha7EHJXcmKeMcGdaJR3UKrg7h/3XX4WdFV/27q9tjx -+CIl79v79TqPaKLL08jWHg== +AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nRTqi6l32vyj +w7wrwMz3pnE3Wn7H87RavltILsGvtfuyZhEnqp6OZ+3pzNYPhSRTBD+jUjn4Rxcw +oDHhKuQGAr3SgD+EVk3KyiOLR2pqvBPsexzIpsSvmrQnGeWBnBx7Y8MBfOQx/San +nkjZTP+Txrc2j0327DaYjSmUW/0WCwIDAQABo1AwTjAdBgNVHQ4EFgQUBCtogVAU +ubcpj3eqI/CGzC5PDiowHwYDVR0jBBgwFoAUBCtogVAUubcpj3eqI/CGzC5PDiow +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCpL+8mSXpjRX28aGsCEFaS +2x1AJ8YdRUyEwUabdOju4OMfgfPWXO1GQKnGx1+z1vqoalbFrwbzQgtEVBoFtVKq +2sVQfjoaexAFFtv2XLIK/cyaQNq/MSeIepbrq3fwinCkYj3IPJDoaeH/UqqkdFVD +EFDctLWfASK3BfIrH5lx8Q== -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAINPYND1suQ5MA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAMt+ApSrJ+XnMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZjbGllbnQwHhcNMTMwOTE4MTQ1MjE3WhcNMTMxMDE4MTQ1MjE3WjA/MRMwEQYK +DAZjbGllbnQwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH0i3GrrSfiYf8 -qk4eZfcPpgLW1X7lSOWxB9yvP7xE4rGNeKAIA6ZMCfvsuf4ABBH6ktPVqKEMnOPP -ro40fyUz/Oa77M0j8hhRld7BGRcckcpkz/xfRBQ4bZuuBXlkFKDeGpyGGVdrUBFg -pGx6tCxgLjcss+Mg31QQp2dgfHsuXwIDAQABo1AwTjAdBgNVHQ4EFgQUDrNUQrfC -7FA4jhm5WBPqhpwIBc8wHwYDVR0jBBgwFoAUDrNUQrfC7FA4jhm5WBPqhpwIBc8w -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBD0fpXPv6Vv80uibJ1njm9 -znClMWKRMRu2jU1P3aSynzLHssqIA+hWCNZZHyXvHOvsizEhJU1aW/zTuUSeWg0Q -Ay4o3Tycw0gh5NbNNMyyLi5ZivsPq6mYBlnYtCdXmDLj7gqrK4qu2xo19ifaIlUY -sD9uawV17DPPers9aYOqVg== +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== -----END CERTIFICATE----- diff --git a/unittest/libmariadb/certs/client-cert.pem b/unittest/libmariadb/certs/client-cert.pem index fe210e21..69a4d194 100644 --- a/unittest/libmariadb/certs/client-cert.pem +++ b/unittest/libmariadb/certs/client-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAINPYND1suQ5MA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAMt+ApSrJ+XnMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZjbGllbnQwHhcNMTMwOTE4MTQ1MjE3WhcNMTMxMDE4MTQ1MjE3WjA/MRMwEQYK +DAZjbGllbnQwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDH0i3GrrSfiYf8 -qk4eZfcPpgLW1X7lSOWxB9yvP7xE4rGNeKAIA6ZMCfvsuf4ABBH6ktPVqKEMnOPP -ro40fyUz/Oa77M0j8hhRld7BGRcckcpkz/xfRBQ4bZuuBXlkFKDeGpyGGVdrUBFg -pGx6tCxgLjcss+Mg31QQp2dgfHsuXwIDAQABo1AwTjAdBgNVHQ4EFgQUDrNUQrfC -7FA4jhm5WBPqhpwIBc8wHwYDVR0jBBgwFoAUDrNUQrfC7FA4jhm5WBPqhpwIBc8w -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBD0fpXPv6Vv80uibJ1njm9 -znClMWKRMRu2jU1P3aSynzLHssqIA+hWCNZZHyXvHOvsizEhJU1aW/zTuUSeWg0Q -Ay4o3Tycw0gh5NbNNMyyLi5ZivsPq6mYBlnYtCdXmDLj7gqrK4qu2xo19ifaIlUY -sD9uawV17DPPers9aYOqVg== +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== -----END CERTIFICATE----- diff --git a/unittest/libmariadb/certs/client-key-enc.pem b/unittest/libmariadb/certs/client-key-enc.pem index 3a5ea6d4..13c5de18 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----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQItEtCzxFB1MgCAggA -MBQGCCqGSIb3DQMHBAhQRWSgaevikASCAoD0NCt6KOmLcMeg/gMjodCa66nYftCQ -oQ7j62krniWZq2b5CjvSFuh71cq2M5qOEpgs9a6kOTdQ8aZNxaB4mNDgLqoxY9yV -MACfIRoBqHc7TbWwKCPbE+5PzCjCuG+1Hqr3HQYPpOYTZqXHuHNhBWzeUEr+eITf -fnxdoiVnKbwT5E3fVaHGJI7h5JrUkz3So6ynUbE3blmCroHAqsp9N5YAW+Kabq8p -sCVoDz/xat3cyhHWaj3LZsRzr1WmPgqXQtRde6UU8hECZ6JhkqzvMnYCnOmxtXWu -KcRAGg3SQOqYZi7uc8p3beNvfIHffywhGxzMDDGIDhRbw+eDBQmVAZIdHJpZ70Nf -c8Zgdqx7Q8KT8mpu3JlmQ1dl+7Wh8HNejMIHCS18lV1BU3K2gdYmfpzeiFdzFEvq -2evXcU3zP1OKmrcMTaL8oHtbTKk/ArWb3j19/5KxR5BZoiZuZ9+x1GuZx5oF+T+5 -/ExWFtO92EIZvTdhMgLJBnXE0ULUB0vYWN75tVvSc8nKeC+AbZWTYZdB5wtd8YLv -0rz26/kxW/icC5bfNPf8gFojs7bMDDIeqgPLlwLCWkUu6FBTfvlYQYSbHubqAqaH -p76pY2SzMr9ZH0o/mtdjCBxl+Jy6mel7hEa5ADueBoiskUOCWUyy8NndfADX3zaM -uqm45AVI3mu/wEfSpu9DUklhkm9AtXKBi9Ash+Bj8XGWOZixe/xwAU8gABS2VBmB -qXtPPiUqEi2t7wFDEOuqfymnV7khg26Xz45/8LZnHkXJXXZp7aJI4piX/gooLZaT -L5Hso5vidt9tcr3AuNv84ZLXIptZZzun9SIB3klm/tssYFgqxxo/hLaN +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 -----END ENCRYPTED PRIVATE KEY----- diff --git a/unittest/libmariadb/certs/client-key.pem b/unittest/libmariadb/certs/client-key.pem index a4919432..e74aae0c 100644 --- a/unittest/libmariadb/certs/client-key.pem +++ b/unittest/libmariadb/certs/client-key.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXgIBAAKBgQDH0i3GrrSfiYf8qk4eZfcPpgLW1X7lSOWxB9yvP7xE4rGNeKAI -A6ZMCfvsuf4ABBH6ktPVqKEMnOPPro40fyUz/Oa77M0j8hhRld7BGRcckcpkz/xf -RBQ4bZuuBXlkFKDeGpyGGVdrUBFgpGx6tCxgLjcss+Mg31QQp2dgfHsuXwIDAQAB -AoGBALnq696NlM9PlnBXQOH1uz8bFk8vS6coAVaK2yFPqutpBQx9LGDojGT5cSXc -E+GN5/B9ho2oHVhv7WLBpdxgZIpox1C8JUSaCohjFaY3F9m7SzjpasvZ4g9+5Dap -eWmsWs6DlyV4QZy0+7B/nDmtaOzwJ+IgwbkSfB/mJ8nIItBBAkEA+IlW4h4n1Abv -X7TnYpwCEXS0YACVc+Ms6LNu9+u5Yy7p1MMH5brrbHXZlFHqK6eUqKp83K5fCQsO -n2BBO8h54QJBAM3SVQThp70XOMAv0KIJ/2vwhqhNAwVL2pEwP8SZYSGlobUToX68 -RcHCVsGGd9tv2SQAsXeHAK9Oq3paaIarMD8CQQCdN7u3RB4ruMtZvoUUUt3YDvw/ -Mn9YFKAG/+K1f+8A999BELKBN1HPhWlCsuKwBM08OMTNkJxbixwP44LAf5vhAkEA -vhgCIAUOOE2nQ5Gl3tLfDmFS7URbgtvBHZFzg++pTzs79BMSeAwJXWBRYmIAdzKB -WYguYFfW4RMGu3WezqpzXwJAf4VPFKjd4om9+44dX8egxFO9vqX2/OV2CdxyGZnB -5VZB3sL3ip2XdKCLnPN4qdDNlulq9TBuMu0SK5dZcwBiCA== +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== -----END RSA PRIVATE KEY----- diff --git a/unittest/libmariadb/certs/server-cert.pem b/unittest/libmariadb/certs/server-cert.pem index 133f23d3..a5674fe8 100644 --- a/unittest/libmariadb/certs/server-cert.pem +++ b/unittest/libmariadb/certs/server-cert.pem @@ -1,15 +1,15 @@ -----BEGIN CERTIFICATE----- -MIICTDCCAbWgAwIBAgIJAMc8o9u+bopUMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ +MIICTDCCAbWgAwIBAgIJAKKW9xg1tcRqMA0GCSqGSIb3DQEBBQUAMD8xEzARBgoJ kiaJk/IsZAEZFgNjb20xFzAVBgoJkiaJk/IsZAEZFgdleGFtcGxlMQ8wDQYDVQQD -DAZzZXJ2ZXIwHhcNMTMwOTE4MTQ1MjE3WhcNMTMxMDE4MTQ1MjE3WjA/MRMwEQYK +DAZzZXJ2ZXIwHhcNMTMxMDI3MTgzMzM5WhcNMTMxMTI2MTgzMzM5WjA/MRMwEQYK CZImiZPyLGQBGRYDY29tMRcwFQYKCZImiZPyLGQBGRYHZXhhbXBsZTEPMA0GA1UE -AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDSnS+kxI2wBY1M -eINRxfpyx5BQ8x4hX8o79PT+1PpEYEt/aNL1D2LronG4tbpB6pFTJ+mxnbPAOhns -nGEpYYh5Tz1VOcB1+IMko/Eqa4jComxb1Yxv3c1xbtFNyGaylOCQ1KHs60UNDL8K -eZs827ys293jPjR7Kz3fzTfPRCgc3wIDAQABo1AwTjAdBgNVHQ4EFgQUDYVv8BN8 -pzV3lwVpUzg1zSFLm9UwHwYDVR0jBBgwFoAUDYVv8BN8pzV3lwVpUzg1zSFLm9Uw -DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQBkU+Vx9Qkx/l/covoosxUl -xigDiZf0WZhsBNudu3aB5OV08eXLdkPxnF/nmTotiK+FvmIAh1fM65mMLlxbfRpH -3kAlI470shYEaysC1aIgcdha7EHJXcmKeMcGdaJR3UKrg7h/3XX4WdFV/27q9tjx -+CIl79v79TqPaKLL08jWHg== +AwwGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC2nRTqi6l32vyj +w7wrwMz3pnE3Wn7H87RavltILsGvtfuyZhEnqp6OZ+3pzNYPhSRTBD+jUjn4Rxcw +oDHhKuQGAr3SgD+EVk3KyiOLR2pqvBPsexzIpsSvmrQnGeWBnBx7Y8MBfOQx/San +nkjZTP+Txrc2j0327DaYjSmUW/0WCwIDAQABo1AwTjAdBgNVHQ4EFgQUBCtogVAU +ubcpj3eqI/CGzC5PDiowHwYDVR0jBBgwFoAUBCtogVAUubcpj3eqI/CGzC5PDiow +DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCpL+8mSXpjRX28aGsCEFaS +2x1AJ8YdRUyEwUabdOju4OMfgfPWXO1GQKnGx1+z1vqoalbFrwbzQgtEVBoFtVKq +2sVQfjoaexAFFtv2XLIK/cyaQNq/MSeIepbrq3fwinCkYj3IPJDoaeH/UqqkdFVD +EFDctLWfASK3BfIrH5lx8Q== -----END CERTIFICATE----- diff --git a/unittest/libmariadb/certs/server-key-enc.pem b/unittest/libmariadb/certs/server-key-enc.pem index 41487f6d..4579a4d6 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----- -MIICxjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQILNmuYbHy6EsCAggA -MBQGCCqGSIb3DQMHBAh39D+PX3mtuASCAoBCFRKn73NQZlDOzIhe0oNZcB5NCAaw -bIySG3lwlFU5YUcttZ6aLnaHOPBDjCSf3TFSXmxBDKYDgWz8A54MOa3lHVcjVgAn -U1jpNRRfW82t4b7zyf0EdHi2IsOjjW4VUJLZjsyYqFBhTaT7Wz4nL6iHRnE2lndM -25LGpNkwlrkRyB5tvIQTeEThCWscJj4/DCNtCvTfDtgyCGjAL+Hl1Ggfx6tJRoLO -A8XxdrfP4SGxOBLe9tI65XSviujr+pXt4Gw7SwjnyuqCqZ7zdpmI/A9SmPwLScRk -HSO0h4aXXZOOHvVjR3UtHPltOaHvlotnWuxC2c7OlAK2swa/InHPpXpYdObqRg92 -uV6Kn26XpT7+IlY0PrO6TmvbjF5FgKh9R+yBY4S7Faa0Tte32V2nomi0Z6FITrA1 -cC5b32ligf/cHn/0i9E/spgW7yyhbAeNdBmq/3Eer8fc6EjKfd7DTF+ieNgC+OxW -hR6OnJcmmTqtw/GYOLpWrguQ5O/BkzIpZXhmpsluAq31XSQRrvWDHKJizj/PoVBg -SYjGPX7C/LGYcAwytRUDZSURZX03vE987KfdzrvqMfwoxmkdhDvWQ2/Nr6lWb488 -hpUwcSnGmrKM2bMCuOD5CTz4u77wHXVt6ychdqyrLI1wBQKX7yysutU0jqOwsSxQ -OWzEurh1WGEyDKzTrFSNElTwCA6pF7nvF9aOd2D2U/tMw15Gx5hknu28KeMuQI6+ -ueyG3mbE3gKSbKlFlCYhpJv0s0++Dbrp9rh5oPZG1yj+9+D8M8yB4rDFYNiKJ3Ot -X/RoN8PXz9ToD6Z715llXl5t1gYmayzlNjcI/kvAXT68IZr0CzHNJxMM +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 -----END ENCRYPTED PRIVATE KEY----- diff --git a/unittest/libmariadb/certs/server-key.pem b/unittest/libmariadb/certs/server-key.pem index b4342a6a..a38b7264 100644 --- a/unittest/libmariadb/certs/server-key.pem +++ b/unittest/libmariadb/certs/server-key.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDSnS+kxI2wBY1MeINRxfpyx5BQ8x4hX8o79PT+1PpEYEt/aNL1 -D2LronG4tbpB6pFTJ+mxnbPAOhnsnGEpYYh5Tz1VOcB1+IMko/Eqa4jComxb1Yxv -3c1xbtFNyGaylOCQ1KHs60UNDL8KeZs827ys293jPjR7Kz3fzTfPRCgc3wIDAQAB -AoGBAIODSYvOfFcMsHWuzvlR8ZiYisIxfYADi4my5QT3QqtNofcWIpyJlhBjaDWZ -rIuaiFJvmtqhCewfm66G25j2YTuT0N4rZkcEzPm9y6NGgEgBWgMM01Jm2scg7WEN -IS/KYWptqGxeMLSPWAaVUT6LU4wfbueXBBfV9Mp0jBXW/vKhAkEA+9GhXU65/eQO -HnZRfPspuWeHAFRYGmPWnClDdOjFlmL0PpC5f6kENtX41PZEDUj1damJIJ/A/zRB -heKn9UV6kQJBANYcaYxuhCpjvlSm8wRc80AY8Ncn8hDQBCHhjHWSOdDyv/rvKeht -lOSeu8UJieJJwccJGa002Ql/ByvZIgJUeG8CQDqBF5ZQBhIge89D+eapi6YRkWHY -Nqfa7i9VvuBYfB9WWhx3D0HDiMEcsTT5ChJ0EuMFQmCb/QDNqTNr1026mKECQBRP -o6+fuEfxKFgNclZCnwzAkPBIKM1xfkLci5+HnJZ2wMGEOJyE8K/zYuqhKgRebNR9 -x4LH1aLx+vMs6O4Bp18CQGUQe24ONr9t+hSJ9FNdNfww/lIzJWvCt7xpqdccbd9O -3mrka7/Kfl8LFEpkk7XuAXuNB0wgd0aowD7NnZgaJcs= +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 -----END RSA PRIVATE KEY-----