If a man was a twelve month CSA TN volunteer & enlisted on May 23 1861, would he have been required to serve until May 23 1864 or until the war ended ?

"Three years or the war", which one ?

Thanks,

D.W.