On the basis of recent results on hamiltonicity and hamiltonian connectedness in the square of a 2-block, we determine the most general block-cutvertex structure a graph $G$ may have in order to guarantee that $G^2$ is hamiltonian, hamiltonian connected, respectively. Such an approach was already developed for hamiltonian total graphs.